[Pkg-ocaml-maint-commits] [ocaml] 01/01: CVE-2015-8869 (Closes: #824139)

[Mehdi Dogguy]

This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch debian/stretch
in repository ocaml.

commit 393e47728f6bb849b1395c20f4d482ec1f6fef52
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sun Nov 6 14:02:15 2016 +0100

    CVE-2015-8869 (Closes: #824139)
---
 debian/changelog                          |  6 +++
 debian/patches/0012-arm-default-PIC.patch |  9 ++--
 debian/patches/0013-CVE-2015-8869.patch   | 71 +++++++++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 4 files changed, 82 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c336057..5775070 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocaml (4.02.3-9) UNRELEASED; urgency=medium
+
+  * CVE-2015-8869 (Closes: #824139)
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Sun, 06 Nov 2016 14:01:46 +0100
+
 ocaml (4.02.3-8) unstable; urgency=medium
 
   * Default to PIC on arm, to fix failing armhf tests (Closes: #837359).
diff --git a/debian/patches/0012-arm-default-PIC.patch b/debian/patches/0012-arm-default-PIC.patch
index 23277cf..020e41d 100644
--- a/debian/patches/0012-arm-default-PIC.patch
+++ b/debian/patches/0012-arm-default-PIC.patch
@@ -1,9 +1,8 @@
-Description: Default to PIC on arm
- Otherwise the armhf build fails now that PIE is enabled by default.
-Author: Mehdi Dogguy <mehdi at debian.org>
-Date: Sun, 6 Nov 2016 10:36:00 +0100
+From: Mehdi Dogguy <mehdi at dogguy.org>
+Date: Sun, 6 Nov 2016 13:52:58 +0100
+Subject: arm-default-PIC
+
 Bug-Debian: https://bugs.debian.org/837359
-Forwarded: TODO
 
 ---
  asmcomp/arm/arch.ml | 2 +-
diff --git a/debian/patches/0013-CVE-2015-8869.patch b/debian/patches/0013-CVE-2015-8869.patch
new file mode 100644
index 0000000..4604209
--- /dev/null
+++ b/debian/patches/0013-CVE-2015-8869.patch
@@ -0,0 +1,71 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Sun, 6 Nov 2016 13:56:22 +0100
+Subject: CVE-2015-8869
+
+Forwarded: not-needed
+Bug-Upstream: http://caml.inria.fr/mantis/view.php?id=7003
+Bug-Debian: http://bugs.debian.org/824139
+Applied-Upstream: 4.03.0, https://github.com/ocaml/ocaml/commit/659615c7b100a89eafe6253e7a5b9d84d0e8df74#diff-a97df53e3ebc59bb457191b496c90762
+---
+ byterun/alloc.c  | 4 ++--
+ byterun/intern.c | 2 +-
+ byterun/str.c    | 4 ++--
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/byterun/alloc.c b/byterun/alloc.c
+index b421cac..3d7dfc4 100644
+--- a/byterun/alloc.c
++++ b/byterun/alloc.c
+@@ -147,7 +147,7 @@ CAMLexport int caml_convert_flag_list(value list, int *flags)
+ 
+ CAMLprim value caml_alloc_dummy(value size)
+ {
+-  mlsize_t wosize = Int_val(size);
++  mlsize_t wosize = Long_val(size);
+ 
+   if (wosize == 0) return Atom(0);
+   return caml_alloc (wosize, 0);
+@@ -161,7 +161,7 @@ CAMLprim value caml_alloc_dummy_function(value size,value arity)
+ 
+ CAMLprim value caml_alloc_dummy_float (value size)
+ {
+-  mlsize_t wosize = Int_val(size) * Double_wosize;
++  mlsize_t wosize = Long_val(size) * Double_wosize;
+ 
+   if (wosize == 0) return Atom(0);
+   return caml_alloc (wosize, 0);
+diff --git a/byterun/intern.c b/byterun/intern.c
+index d2943af..e5cdeb4 100644
+--- a/byterun/intern.c
++++ b/byterun/intern.c
+@@ -287,7 +287,7 @@ static void intern_rec(value *dest)
+   case OFreshOID:
+     /* Refresh the object ID */
+     /* but do not do it for predefined exception slots */
+-    if (Int_val(Field((value)dest, 1)) >= 0)
++    if (Long_val(Field((value)dest, 1)) >= 0)
+       caml_set_oo_id((value)dest);
+     /* Pop item and iterate */
+     sp--;
+diff --git a/byterun/str.c b/byterun/str.c
+index a72b34c..dc69624 100644
+--- a/byterun/str.c
++++ b/byterun/str.c
+@@ -266,7 +266,7 @@ CAMLprim value caml_string_greaterequal(value s1, value s2)
+ CAMLprim value caml_blit_string(value s1, value ofs1, value s2, value ofs2,
+                                 value n)
+ {
+-  memmove(&Byte(s2, Long_val(ofs2)), &Byte(s1, Long_val(ofs1)), Int_val(n));
++  memmove(&Byte(s2, Long_val(ofs2)), &Byte(s1, Long_val(ofs1)), Long_val(n));
+   return Val_unit;
+ }
+ 
+@@ -293,7 +293,7 @@ CAMLprim value caml_is_printable(value chr)
+ 
+ CAMLprim value caml_bitvect_test(value bv, value n)
+ {
+-  int pos = Int_val(n);
++  intnat pos = Long_val(n);
+   return Val_int(Byte_u(bv, pos >> 3) & (1 << (pos & 7)));
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 552c4d7..2f75dd0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
 0010-Add-a-.file-directive-to-generated-.s-files.patch
 0011-Compatibility-with-x32-architecture.patch
 0012-arm-default-PIC.patch
+0013-CVE-2015-8869.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml.git