mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
gnu: jq: Fix CVE-2015-8863.
* gnu/packages/patches/jq-CVE-2015-8863.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/web.scm (jq)[source]: Use it. Signed-off-by: Leo Famulari <leo@famulari.name>
This commit is contained in:
parent
e08ca4b966
commit
f2b4c18cd9
3 changed files with 51 additions and 1 deletions
|
@ -595,6 +595,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/jasper-CVE-2016-2089.patch \
|
||||
%D%/packages/patches/jasper-CVE-2016-2116.patch \
|
||||
%D%/packages/patches/jbig2dec-ignore-testtest.patch \
|
||||
%D%/packages/patches/jq-CVE-2015-8863.patch \
|
||||
%D%/packages/patches/khmer-use-libraries.patch \
|
||||
%D%/packages/patches/kmod-module-directory.patch \
|
||||
%D%/packages/patches/laby-make-install.patch \
|
||||
|
|
45
gnu/packages/patches/jq-CVE-2015-8863.patch
Normal file
45
gnu/packages/patches/jq-CVE-2015-8863.patch
Normal file
|
@ -0,0 +1,45 @@
|
|||
Fix CVE-2015-8863 (Off-by-one error in the tokenadd function in
|
||||
jv_parse.c in jq allows remote attackers to cause a denial of service
|
||||
(crash) via a long JSON-encoded number, which triggers a heap-based
|
||||
buffer overflow):
|
||||
|
||||
<https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-8863>
|
||||
|
||||
Copied from upstream code repository:
|
||||
|
||||
<https://github.com/stedolan/jq/commit/8eb1367ca44e772963e704a700ef72ae2e12babd>
|
||||
|
||||
From 8eb1367ca44e772963e704a700ef72ae2e12babd Mon Sep 17 00:00:00 2001
|
||||
From: Nicolas Williams <nico@cryptonector.com>
|
||||
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.
|
||||
---
|
||||
jv_parse.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/jv_parse.c b/jv_parse.c
|
||||
index 3102ed4..84245b8 100644
|
||||
--- a/jv_parse.c
|
||||
+++ b/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)
|
|
@ -3293,7 +3293,11 @@ (define-public jq
|
|||
"/" name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0g29kyz4ykasdcrb0zmbrp2jqs9kv1wz9swx849i2d1ncknbzln4"))))
|
||||
"0g29kyz4ykasdcrb0zmbrp2jqs9kv1wz9swx849i2d1ncknbzln4"))
|
||||
;; This patch has been pushed and the vulnerability will be
|
||||
;; fixed in the next release after 1.5.
|
||||
;; https://github.com/stedolan/jq/issues/995
|
||||
(patches (search-patches "jq-CVE-2015-8863.patch"))))
|
||||
(inputs
|
||||
`(("oniguruma" ,oniguruma)))
|
||||
(native-inputs
|
||||
|
|
Loading…
Reference in a new issue