[PATCH] gnu: mupdf: Fix some security problems in bundled mujs.

[Marius Bakke]

* gnu/packages/patches/mupdf-mujs-heap-buffer-overflow.patch: New file.
* gnu/packages/patches/mupdf-mujs-null-pointer-dereference.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add them.
* gnu/packages/pdf.scm (mupdf)[source]: Use them.
---
 gnu/local.mk                                       |   2 +
 .../patches/mupdf-mujs-heap-buffer-overflow.patch  |  34 ++++
 .../mupdf-mujs-null-pointer-dereference.patch      | 187 +++++++++++++++++++++
 gnu/packages/pdf.scm                               |   4 +-
 4 files changed, 226 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/mupdf-mujs-heap-buffer-overflow.patch
 create mode 100644 
gnu/packages/patches/mupdf-mujs-null-pointer-dereference.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 21580a387..365513107 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -753,6 +753,8 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/multiqc-fix-git-subprocess-error.patch  \
   %D%/packages/patches/mumps-build-parallelism.patch           \
   %D%/packages/patches/mupdf-build-with-openjpeg-2.1.patch     \
+  %D%/packages/patches/mupdf-mujs-heap-buffer-overflow.patch   \
+  %D%/packages/patches/mupdf-mujs-null-pointer-dereference.patch       \
   %D%/packages/patches/mupen64plus-ui-console-notice.patch     \
   %D%/packages/patches/musl-CVE-2016-8859.patch                        \
   %D%/packages/patches/mutt-store-references.patch             \
diff --git a/gnu/packages/patches/mupdf-mujs-heap-buffer-overflow.patch 
b/gnu/packages/patches/mupdf-mujs-heap-buffer-overflow.patch
new file mode 100644
index 000000000..77a3e45cd
--- /dev/null
+++ b/gnu/packages/patches/mupdf-mujs-heap-buffer-overflow.patch
@@ -0,0 +1,34 @@
+This fixes a heap buffer overflow in MuJS as reported at
+
+http://seclists.org/oss-sec/2017/q1/74
+
+Patch lifted from upstream source repository:
+
+https://git.ghostscript.com/?p=mujs.git;h=77ab465f1c394bb77f00966cd950650f3f53cb24
+
+From 77ab465f1c394bb77f00966cd950650f3f53cb24 Mon Sep 17 00:00:00 2001
+From: Tor Andersson <address@hidden>
+Date: Thu, 12 Jan 2017 14:47:01 +0100
+Subject: [PATCH] Fix 697401: Error when dropping extra arguments to
+ lightweight functions.
+
+---
+ thirdparty/mujs/jsrun.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/thirdparty/mujs/jsrun.c b/thirdparty/mujs/jsrun.c
+index ee80845..782a6f9 100644
+--- a/thirdparty/mujs/jsrun.c
++++ b/thirdparty/mujs/jsrun.c
+@@ -937,7 +937,7 @@ static void jsR_calllwfunction(js_State *J, int n, 
js_Function *F, js_Environmen
+       jsR_savescope(J, scope);
+ 
+       if (n > F->numparams) {
+-              js_pop(J, F->numparams - n);
++              js_pop(J, n - F->numparams);
+               n = F->numparams;
+       }
+       for (i = n; i < F->varlen; ++i)
+-- 
+2.9.1
+
diff --git a/gnu/packages/patches/mupdf-mujs-null-pointer-dereference.patch 
b/gnu/packages/patches/mupdf-mujs-null-pointer-dereference.patch
new file mode 100644
index 000000000..9fe1921ef
--- /dev/null
+++ b/gnu/packages/patches/mupdf-mujs-null-pointer-dereference.patch
@@ -0,0 +1,187 @@
+This fixes a null pointer dereference in MuJS regexp.c as
+reported at:
+
+http://seclists.org/oss-sec/2017/q1/74
+
+Patch lifted from upstream source repository:
+
+http://git.ghostscript.com/?p=mujs.git;h=fd003eceda531e13fbdd1aeb6e9c73156496e569
+
+From fd003eceda531e13fbdd1aeb6e9c73156496e569 Mon Sep 17 00:00:00 2001
+From: Tor Andersson <address@hidden>
+Date: Fri, 2 Dec 2016 14:56:20 -0500
+Subject: [PATCH] Fix 697381: check allocation when compiling regular
+ expressions.
+
+Also use allocator callback function.
+---
+ thirdparty/mujs/jsgc.c     |  2 +-
+ thirdparty/mujs/jsregexp.c |  2 +-
+ thirdparty/mujs/jsstate.c  |  6 ------
+ thirdparty/mujs/regexp.c   | 45 +++++++++++++++++++++++++++++++++++----------
+ thirdparty/mujs/regexp.h   |  7 +++++++
+ 5 files changed, 44 insertions(+), 18 deletions(-)
+
+diff --git a/thirdparty/mujs/jsgc.c b/thirdparty/mujs/jsgc.c
+index 4f7e7dc..f80111e 100644
+--- a/thirdparty/mujs/jsgc.c
++++ b/thirdparty/mujs/jsgc.c
+@@ -46,7 +46,7 @@ static void jsG_freeobject(js_State *J, js_Object *obj)
+               jsG_freeproperty(J, obj->head);
+       if (obj->type == JS_CREGEXP) {
+               js_free(J, obj->u.r.source);
+-              js_regfree(obj->u.r.prog);
++              js_regfreex(J->alloc, J->actx, obj->u.r.prog);
+       }
+       if (obj->type == JS_CITERATOR)
+               jsG_freeiterator(J, obj->u.iter.head);
+diff --git a/thirdparty/mujs/jsregexp.c b/thirdparty/mujs/jsregexp.c
+index a2d5156..7b09c06 100644
+--- a/thirdparty/mujs/jsregexp.c
++++ b/thirdparty/mujs/jsregexp.c
+@@ -16,7 +16,7 @@ void js_newregexp(js_State *J, const char *pattern, int 
flags)
+       if (flags & JS_REGEXP_I) opts |= REG_ICASE;
+       if (flags & JS_REGEXP_M) opts |= REG_NEWLINE;
+ 
+-      prog = js_regcomp(pattern, opts, &error);
++      prog = js_regcompx(J->alloc, J->actx, pattern, opts, &error);
+       if (!prog)
+               js_syntaxerror(J, "regular expression: %s", error);
+ 
+diff --git a/thirdparty/mujs/jsstate.c b/thirdparty/mujs/jsstate.c
+index 638cab3..fd5bcf6 100644
+--- a/thirdparty/mujs/jsstate.c
++++ b/thirdparty/mujs/jsstate.c
+@@ -9,12 +9,6 @@
+ 
+ static void *js_defaultalloc(void *actx, void *ptr, int size)
+ {
+-      if (size == 0) {
+-              free(ptr);
+-              return NULL;
+-      }
+-      if (!ptr)
+-              return malloc((size_t)size);
+       return realloc(ptr, (size_t)size);
+ }
+ 
+diff --git a/thirdparty/mujs/regexp.c b/thirdparty/mujs/regexp.c
+index 9852be2..01c18a3 100644
+--- a/thirdparty/mujs/regexp.c
++++ b/thirdparty/mujs/regexp.c
+@@ -807,23 +807,31 @@ static void dumpprog(Reprog *prog)
+ }
+ #endif
+ 
+-Reprog *regcomp(const char *pattern, int cflags, const char **errorp)
++Reprog *regcompx(void *(*alloc)(void *ctx, void *p, int n), void *ctx,
++      const char *pattern, int cflags, const char **errorp)
+ {
+       struct cstate g;
+       Renode *node;
+       Reinst *split, *jump;
+       int i;
+ 
+-      g.prog = malloc(sizeof (Reprog));
+-      g.pstart = g.pend = malloc(sizeof (Renode) * strlen(pattern) * 2);
++      g.pstart = NULL;
++      g.prog = NULL;
+ 
+       if (setjmp(g.kaboom)) {
+               if (errorp) *errorp = g.error;
+-              free(g.pstart);
+-              free(g.prog);
++              alloc(ctx, g.pstart, 0);
++              alloc(ctx, g.prog, 0);
+               return NULL;
+       }
+ 
++      g.prog = alloc(ctx, NULL, sizeof (Reprog));
++      if (!g.prog)
++              die(&g, "cannot allocate regular expression");
++      g.pstart = g.pend = alloc(ctx, NULL, sizeof (Renode) * strlen(pattern) 
* 2);
++      if (!g.pstart)
++              die(&g, "cannot allocate regular expression parse list");
++
+       g.source = pattern;
+       g.ncclass = 0;
+       g.nsub = 1;
+@@ -840,7 +848,9 @@ Reprog *regcomp(const char *pattern, int cflags, const 
char **errorp)
+               die(&g, "syntax error");
+ 
+       g.prog->nsub = g.nsub;
+-      g.prog->start = g.prog->end = malloc((count(node) + 6) * sizeof 
(Reinst));
++      g.prog->start = g.prog->end = alloc(ctx, NULL, (count(node) + 6) * 
sizeof (Reinst));
++      if (!g.prog->start)
++              die(&g, "cannot allocate regular expression instruction list");
+ 
+       split = emit(g.prog, I_SPLIT);
+       split->x = split + 3;
+@@ -859,20 +869,35 @@ Reprog *regcomp(const char *pattern, int cflags, const 
char **errorp)
+       dumpprog(g.prog);
+ #endif
+ 
+-      free(g.pstart);
++      alloc(ctx, g.pstart, 0);
+ 
+       if (errorp) *errorp = NULL;
+       return g.prog;
+ }
+ 
+-void regfree(Reprog *prog)
++void regfreex(void *(*alloc)(void *ctx, void *p, int n), void *ctx, Reprog 
*prog)
+ {
+       if (prog) {
+-              free(prog->start);
+-              free(prog);
++              alloc(ctx, prog->start, 0);
++              alloc(ctx, prog, 0);
+       }
+ }
+ 
++static void *default_alloc(void *ctx, void *p, int n)
++{
++      return realloc(p, (size_t)n);
++}
++
++Reprog *regcomp(const char *pattern, int cflags, const char **errorp)
++{
++      return regcompx(default_alloc, NULL, pattern, cflags, errorp);
++}
++
++void regfree(Reprog *prog)
++{
++      regfreex(default_alloc, NULL, prog);
++}
++
+ /* Match */
+ 
+ static int isnewline(int c)
+diff --git a/thirdparty/mujs/regexp.h b/thirdparty/mujs/regexp.h
+index 4bb4615..6bb73e8 100644
+--- a/thirdparty/mujs/regexp.h
++++ b/thirdparty/mujs/regexp.h
+@@ -1,6 +1,8 @@
+ #ifndef regexp_h
+ #define regexp_h
+ 
++#define regcompx js_regcompx
++#define regfreex js_regfreex
+ #define regcomp js_regcomp
+ #define regexec js_regexec
+ #define regfree js_regfree
+@@ -8,6 +10,11 @@
+ typedef struct Reprog Reprog;
+ typedef struct Resub Resub;
+ 
++Reprog *regcompx(void *(*alloc)(void *ctx, void *p, int n), void *ctx,
++      const char *pattern, int cflags, const char **errorp);
++void regfreex(void *(*alloc)(void *ctx, void *p, int n), void *ctx,
++      Reprog *prog);
++
+ Reprog *regcomp(const char *pattern, int cflags, const char **errorp);
+ int regexec(Reprog *prog, const char *string, Resub *sub, int eflags);
+ void regfree(Reprog *prog);
+-- 
+2.9.1
+
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 9b3571e67..3388cbaa9 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -489,7 +489,9 @@ extracting content or merging files.")
         (sha256
          (base32
           "0dm8wcs8i29aibzkqkrn8kcnk4q0kd1v66pg48h5c3qqp4v1zk5a"))
-        (patches (search-patches "mupdf-build-with-openjpeg-2.1.patch"))
+        (patches (search-patches "mupdf-build-with-openjpeg-2.1.patch"
+                                 "mupdf-mujs-null-pointer-dereference.patch"
+                                 "mupdf-mujs-heap-buffer-overflow.patch"))
         (modules '((guix build utils)))
         (snippet
             ;; Delete all the bundled libraries except for mujs, which is
-- 
2.11.0