From 7fa094d35c64f81fd1a90d41fd7524d189c3300f Mon Sep 17 00:00:00 2001
From: Alessio Sergi <al3hex@gmail.com>
Date: Wed, 19 Oct 2016 17:09:31 +0200
Subject: [PATCH] musl: fix missing integer overflow checks in regex

http://www.openwall.com/lists/musl/2016/10/18/2
---
 srcpkgs/musl-bootstrap/template               |  2 +-
 ...ger-overflow-checks-in-regexec-buffe.patch | 68 +++++++++++++++++++
 srcpkgs/musl/template                         |  2 +-
 3 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/musl/patches/0001-fix-missing-integer-overflow-checks-in-regexec-buffe.patch

diff --git a/srcpkgs/musl-bootstrap/template b/srcpkgs/musl-bootstrap/template
index 660723d95dd..dfd8a482200 100644
--- a/srcpkgs/musl-bootstrap/template
+++ b/srcpkgs/musl-bootstrap/template
@@ -1,7 +1,7 @@
 # Template file for 'musl-bootstrap'.
 pkgname=musl-bootstrap
 version=1.1.15
-revision=1
+revision=2
 lib32disabled=yes
 wrksrc="musl-${version}"
 build_style=configure
diff --git a/srcpkgs/musl/patches/0001-fix-missing-integer-overflow-checks-in-regexec-buffe.patch b/srcpkgs/musl/patches/0001-fix-missing-integer-overflow-checks-in-regexec-buffe.patch
new file mode 100644
index 00000000000..6b841a70d91
--- /dev/null
+++ b/srcpkgs/musl/patches/0001-fix-missing-integer-overflow-checks-in-regexec-buffe.patch
@@ -0,0 +1,68 @@
+From c3edc06d1e1360f3570db9155d6b318ae0d0f0f7 Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Thu, 06 Oct 2016 22:34:58 +0000
+Subject: fix missing integer overflow checks in regexec buffer size computations
+
+most of the possible overflows were already ruled out in practice by
+regcomp having already succeeded performing larger allocations.
+however at least the num_states*num_tags multiplication can clearly
+overflow in practice. for safety, check them all, and use the proper
+type, size_t, rather than int.
+
+also improve comments, use calloc in place of malloc+memset, and
+remove bogus casts.
+---
+diff --git src/regex/regexec.c src/regex/regexec.c
+index 16c5d0a..dd52319 100644
+--- src/regex/regexec.c
++++ src/regex/regexec.c
+@@ -34,6 +34,7 @@
+ #include <wchar.h>
+ #include <wctype.h>
+ #include <limits.h>
++#include <stdint.h>
+ 
+ #include <regex.h>
+ 
+@@ -206,11 +207,24 @@ tre_tnfa_run_parallel(const tre_tnfa_t *tnfa, const void *string,
+ 
+   /* Allocate memory for temporary data required for matching.	This needs to
+      be done for every matching operation to be thread safe.  This allocates
+-     everything in a single large block from the stack frame using alloca()
+-     or with malloc() if alloca is unavailable. */
++     everything in a single large block with calloc(). */
+   {
+-    int tbytes, rbytes, pbytes, xbytes, total_bytes;
++    size_t tbytes, rbytes, pbytes, xbytes, total_bytes;
+     char *tmp_buf;
++
++    /* Ensure that tbytes and xbytes*num_states cannot overflow, and that
++     * they don't contribute more than 1/8 of SIZE_MAX to total_bytes. */
++    if (num_tags > SIZE_MAX/(8 * sizeof(int) * tnfa->num_states))
++      goto error_exit;
++
++    /* Likewise check rbytes. */
++    if (tnfa->num_states+1 > SIZE_MAX/(8 * sizeof(*reach_next)))
++      goto error_exit;
++
++    /* Likewise check pbytes. */
++    if (tnfa->num_states > SIZE_MAX/(8 * sizeof(*reach_pos)))
++      goto error_exit;
++
+     /* Compute the length of the block we need. */
+     tbytes = sizeof(*tmp_tags) * num_tags;
+     rbytes = sizeof(*reach_next) * (tnfa->num_states + 1);
+@@ -221,10 +235,9 @@ tre_tnfa_run_parallel(const tre_tnfa_t *tnfa, const void *string,
+       + (rbytes + xbytes * tnfa->num_states) * 2 + tbytes + pbytes;
+ 
+     /* Allocate the memory. */
+-    buf = xmalloc((unsigned)total_bytes);
++    buf = calloc(total_bytes, 1);
+     if (buf == NULL)
+       return REG_ESPACE;
+-    memset(buf, 0, (size_t)total_bytes);
+ 
+     /* Get the various pointers within tmp_buf (properly aligned). */
+     tmp_tags = (void *)buf;
+--
+cgit v0.9.0.3-65-g4555
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index b33ce9c2952..c50a272bae2 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -1,7 +1,7 @@
 # Template file for 'musl'.
 pkgname=musl
 version=1.1.15
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr --disable-gcc-wrapper"
 conflicts="glibc>=0"