Package: jq Version: 1.5+dfsg-1 Severity: normal Tags: patch pending Dear maintainer,
I've prepared an NMU for jq (versioned as 1.5+dfsg-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Please note, the change to debian/rules comes from the package's git master. Regards. diff -Nru jq-1.5+dfsg/debian/changelog jq-1.5+dfsg/debian/changelog --- jq-1.5+dfsg/debian/changelog 2015-10-12 02:40:40.000000000 -0400 +++ jq-1.5+dfsg/debian/changelog 2016-11-13 19:48:02.000000000 -0500 @@ -1,3 +1,11 @@ +jq (1.5+dfsg-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Apply patch to fix CVE-2016-4074 (Closes: #822456) + * Apply patch to fix CVE-2015-8863 (Closes: #802231) + + -- Harlan Lieberman-Berg <[email protected]> Sun, 13 Nov 2016 19:48:02 -0500 + jq (1.5+dfsg-1) unstable; urgency=medium * New upstream release. diff -Nru jq-1.5+dfsg/debian/patches/heap-buffer-overflow.patch jq-1.5+dfsg/debian/patches/heap-buffer-overflow.patch --- jq-1.5+dfsg/debian/patches/heap-buffer-overflow.patch 1969-12-31 19:00:00.000000000 -0500 +++ jq-1.5+dfsg/debian/patches/heap-buffer-overflow.patch 2016-11-13 19:44:25.000000000 -0500 @@ -0,0 +1,34 @@ +From 8eb1367ca44e772963e704a700ef72ae2e12babd Mon Sep 17 00:00:00 2001 +From: Nicolas Williams <[email protected]> +Date: Sat, 24 Oct 2015 17:24:57 -0500 +Subject: [PATCH] Heap buffer overflow in tokenadd() (fix #105) + +This was an off-by one: the NUL terminator byte was not allocated on +resize. This was triggered by JSON-encoded numbers longer than 256 +bytes. +--- + src/jv_parse.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/jv_parse.c b/src/jv_parse.c +index 3102ed4..84245b8 100644 +--- src/jv_parse.c ++++ src/jv_parse.c +@@ -383,7 +383,7 @@ static pfunc stream_token(struct jv_parser* p, char ch) { + + static void tokenadd(struct jv_parser* p, char c) { + assert(p->tokenpos <= p->tokenlen); +- if (p->tokenpos == p->tokenlen) { ++ if (p->tokenpos >= (p->tokenlen - 1)) { + p->tokenlen = p->tokenlen*2 + 256; + p->tokenbuf = jv_mem_realloc(p->tokenbuf, p->tokenlen); + } +@@ -485,7 +485,7 @@ static pfunc check_literal(struct jv_parser* p) { + TRY(value(p, v)); + } else { + // FIXME: better parser +- p->tokenbuf[p->tokenpos] = 0; // FIXME: invalid ++ p->tokenbuf[p->tokenpos] = 0; + char* end = 0; + double d = jvp_strtod(&p->dtoa, p->tokenbuf, &end); + if (end == 0 || *end != 0) diff -Nru jq-1.5+dfsg/debian/patches/series jq-1.5+dfsg/debian/patches/series --- jq-1.5+dfsg/debian/patches/series 2015-10-12 02:40:40.000000000 -0400 +++ jq-1.5+dfsg/debian/patches/series 2016-11-13 19:44:16.000000000 -0500 @@ -3,3 +3,5 @@ patch-version-into-build.patch static-libjq-dynamic-libonig2.patch dont-distribute-duplicate-docs.patch +stack-exhaustion.patch +heap-buffer-overflow.patch diff -Nru jq-1.5+dfsg/debian/patches/stack-exhaustion.patch jq-1.5+dfsg/debian/patches/stack-exhaustion.patch --- jq-1.5+dfsg/debian/patches/stack-exhaustion.patch 1969-12-31 19:00:00.000000000 -0500 +++ jq-1.5+dfsg/debian/patches/stack-exhaustion.patch 2016-11-13 19:44:36.000000000 -0500 @@ -0,0 +1,37 @@ +From 2d38a12d686a5156d4e7afb1fed7851805590582 Mon Sep 17 00:00:00 2001 +From: W-Mark Kubacki <[email protected]> +Date: Fri, 19 Aug 2016 19:50:39 +0200 +Subject: [PATCH] Skip printing at MAX_DEPTH and deeper + +This addresses #1136, and mitigates a stack exhaustion when printing +a very deeply nested term. +--- + src/jv_print.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/src/jv_print.c b/src/jv_print.c +index 5f4f234..cf6651b 100644 +--- src/jv_print.c ++++ src/jv_print.c +@@ -13,6 +13,10 @@ + #include "jv_dtoa.h" + #include "jv_unicode.h" + ++#ifndef MAX_DEPTH ++#define MAX_DEPTH 256 ++#endif ++ + #define ESC "\033" + #define COL(c) (ESC "[" c "m") + #define COLRESET (ESC "[0m") +@@ -150,7 +154,9 @@ static void jv_dump_term(struct dtoa_context* C, jv x, int flags, int indent, FI + } + } + } +- switch (jv_get_kind(x)) { ++ if (indent > MAX_DEPTH) { ++ put_str("<stripped: exceeds max depth>", F, S, flags & JV_PRINT_ISATTY); ++ } else switch (jv_get_kind(x)) { + default: + case JV_KIND_INVALID: + if (flags & JV_PRINT_INVALID) { diff -Nru jq-1.5+dfsg/debian/rules jq-1.5+dfsg/debian/rules --- jq-1.5+dfsg/debian/rules 2015-10-12 02:40:40.000000000 -0400 +++ jq-1.5+dfsg/debian/rules 2016-11-13 19:27:52.000000000 -0500 @@ -16,6 +16,9 @@ cd docs && rake manpage > ../jq.1 dh_auto_configure +override_dh_auto_test: + VERBOSE=1 dh_auto_test + override_dh_auto_clean: dh_auto_clean
