jq-1.7.1: Backport multiple CVE fixes
v2 cover jq-1.7.1: Backport multiple CVE fixes
From: Roland Kovacs <[email protected]>
I forgot to run patchtest before sending v1, so this version includes the missing 'Upstream-Status' and 'CVE' fields in the added patch files.
Roland Kovacs (1):
jq-1.7.1: Backport multiple CVE fixes
.../jq/jq/CVE-2024-23337.patch | 236 ++++++++++++++++++ .../jq/jq/CVE-2024-53427.patch | 82 ++++++ .../jq/jq/CVE-2025-48060.patch | 48 ++++ meta-oe/recipes-devtools/jq/jq_1.7.1.bb | 3 + 4 files changed, 369 insertions(+) create mode 100644 meta-oe/recipes-devtools/jq/jq/CVE-2024-23337.patch create mode 100644 meta-oe/recipes-devtools/jq/jq/CVE-2024-53427.patch create mode 100644 meta-oe/recipes-devtools/jq/jq/CVE-2025-48060.patch
PATCH v2 1/1 jq-1.7.1: Backport multiple CVE fixes
From: Roland Kovacs <[email protected]>
Backported CVE-2024-23337, CVE-2024-53427 from jq-1.8.0 and CVE-2025-48060 from jq-1.8.1.
--- .../jq/jq/CVE-2024-23337.patch | 236 ++++++++++++++++++ .../jq/jq/CVE-2024-53427.patch | 82 ++++++ .../jq/jq/CVE-2025-48060.patch | 48 ++++ meta-oe/recipes-devtools/jq/jq_1.7.1.bb | 3 + 4 files changed, 369 insertions(+) create mode 100644 meta-oe/recipes-devtools/jq/jq/CVE-2024-23337.patch create mode 100644 meta-oe/recipes-devtools/jq/jq/CVE-2024-53427.patch create mode 100644 meta-oe/recipes-devtools/jq/jq/CVE-2025-48060.patch
meta-oe/recipes-devtools/jq/jq/CVE-2024-23337.patch new file +236 -0
@@ -0,0 +1,236 @@ +From d9237e3d607f946fe74540efa42a2eacca2a6fbd Mon Sep 17 00:00:00 2001 +From: itchyny <[email protected]> +Date: Wed, 21 May 2025 07:45:00 +0900 +Subject: [PATCH] Fix signed integer overflow in jvp_array_write and + jvp_object_rehash + +This commit fixes signed integer overflow and SEGV issues on growing +arrays and objects. The size of arrays and objects is now limited to +`536870912` (`0x20000000`). This fixes CVE-2024-23337 and fixes #3262. + +Upstream-Status: Backport [https://github.com/jqlang/jq.git/commit/de21386681c0df0104a99d9d09db23a9b2a78b1e] +CVE: CVE-2024-23337 + +(cherry picked from commit de21386681c0df0104a99d9d09db23a9b2a78b1e) +Signed-off-by: Roland Kovacs <[email protected]> +--- + src/jv.c | 57 ++++++++++++++++++++++++++++++++++++++++----------- + src/jv_aux.c | 9 ++++---- + tests/jq.test | 4 ++++ + 3 files changed, 54 insertions(+), 16 deletions(-) + +diff --git a/src/jv.c b/src/jv.c +index 34573b8..15990f1 100644 +--- a/src/jv.c ++++ b/src/jv.c +@@ -1001,6 +1001,11 @@ jv jv_array_set(jv j, int idx, jv val) { + jv_free(val); + return jv_invalid_with_msg(jv_string("Out of bounds negative array index")); + } ++ if (idx > (INT_MAX >> 2) - jvp_array_offset(j)) { ++ jv_free(j); ++ jv_free(val); ++ return jv_invalid_with_msg(jv_string("Array index too large")); ++ } + // copy/free of val,j coalesced + jv* slot = jvp_array_write(&j, idx); + jv_free(*slot); +@@ -1020,6 +1025,7 @@ jv jv_array_concat(jv a, jv b) { + // FIXME: could be faster + jv_array_foreach(b, i, elem) { + a = jv_array_append(a, elem); ++ if (!jv_is_valid(a)) break; + } + jv_free(b); + return a; +@@ -1283,15 +1289,22 @@ jv jv_string_indexes(jv j, jv k) { + assert(JVP_HAS_KIND(k, JV_KIND_STRING)); + const char *jstr = jv_string_value(j); + const char *idxstr = jv_string_value(k); +- const char *p; ++ const char *p, *lp; + int jlen = jv_string_length_bytes(jv_copy(j)); + int idxlen = jv_string_length_bytes(jv_copy(k)); + jv a = jv_array(); + + if (idxlen != 0) { +- p = jstr; ++ int n = 0; ++ p = lp = jstr; + while ((p = _jq_memmem(p, (jstr + jlen) - p, idxstr, idxlen)) != NULL) { +- a = jv_array_append(a, jv_number(p - jstr)); ++ while (lp < p) { ++ lp += jvp_utf8_decode_length(*lp); ++ n++; ++ } ++ ++ a = jv_array_append(a, jv_number(n)); ++ if (!jv_is_valid(a)) break; + p++; + } + } +@@ -1314,14 +1327,17 @@ jv jv_string_split(jv j, jv sep) { + + if (seplen == 0) { + int c; +- while ((jstr = jvp_utf8_next(jstr, jend, &c))) ++ while ((jstr = jvp_utf8_next(jstr, jend, &c))) { + a = jv_array_append(a, jv_string_append_codepoint(jv_string(""), c)); ++ if (!jv_is_valid(a)) break; ++ } + } else { + for (p = jstr; p < jend; p = s + seplen) { + s = _jq_memmem(p, jend - p, sepstr, seplen); + if (s == NULL) + s = jend; + a = jv_array_append(a, jv_string_sized(p, s - p)); ++ if (!jv_is_valid(a)) break; + // Add an empty string to denote that j ends on a sep + if (s + seplen == jend && seplen != 0) + a = jv_array_append(a, jv_string("")); +@@ -1339,8 +1355,10 @@ jv jv_string_explode(jv j) { + const char* end = i + len; + jv a = jv_array_sized(len); + int c; +- while ((i = jvp_utf8_next(i, end, &c))) ++ while ((i = jvp_utf8_next(i, end, &c))) { + a = jv_array_append(a, jv_number(c)); ++ if (!jv_is_valid(a)) break; ++ } + jv_free(j); + return a; + } +@@ -1614,10 +1632,13 @@ static void jvp_object_free(jv o) { + } + } + +-static jv jvp_object_rehash(jv object) { ++static int jvp_object_rehash(jv *objectp) { ++ jv object = *objectp; + assert(JVP_HAS_KIND(object, JV_KIND_OBJECT)); + assert(jvp_refcnt_unshared(object.u.ptr)); + int size = jvp_object_size(object); ++ if (size > INT_MAX >> 2) ++ return 0; + jv new_object = jvp_object_new(size * 2); + for (int i=0; i<size; i++) { + struct object_slot* slot = jvp_object_get_slot(object, i); +@@ -1630,7 +1651,8 @@ static jv jvp_object_rehash(jv object) { + } + // references are transported, just drop the old table + jv_mem_free(jvp_object_ptr(object)); +- return new_object; ++ *objectp = new_object; ++ return 1; + } + + static jv jvp_object_unshare(jv object) { +@@ -1659,27 +1681,32 @@ static jv jvp_object_unshare(jv object) { + return new_object; + } + +-static jv* jvp_object_write(jv* object, jv key) { ++static int jvp_object_write(jv* object, jv key, jv **valpp) { + *object = jvp_object_unshare(*object); + int* bucket = jvp_object_find_bucket(*object, key); + struct object_slot* slot = jvp_object_find_slot(*object, key, bucket); + if (slot) { + // already has the key + jvp_string_free(key); +- return &slot->value; ++ *valpp = &slot->value; ++ return 1; + } + slot = jvp_object_add_slot(*object, key, bucket); + if (slot) { + slot->value = jv_invalid(); + } else { +- *object = jvp_object_rehash(*object); ++ if (!jvp_object_rehash(object)) { ++ *valpp = NULL; ++ return 0; ++ } + bucket = jvp_object_find_bucket(*object, key); + assert(!jvp_object_find_slot(*object, key, bucket)); + slot = jvp_object_add_slot(*object, key, bucket); + assert(slot); + slot->value = jv_invalid(); + } +- return &slot->value; ++ *valpp = &slot->value; ++ return 1; + } + + static int jvp_object_delete(jv* object, jv key) { +@@ -1779,7 +1806,11 @@ jv jv_object_set(jv object, jv key, jv value) { + assert(JVP_HAS_KIND(object, JV_KIND_OBJECT)); + assert(JVP_HAS_KIND(key, JV_KIND_STRING)); + // copy/free of object, key, value coalesced +- jv* slot = jvp_object_write(&object, key); ++ jv* slot; ++ if (!jvp_object_write(&object, key, &slot)) { ++ jv_free(object); ++ return jv_invalid_with_msg(jv_string("Object too big")); ++ } + jv_free(*slot); + *slot = value; + return object; +@@ -1804,6 +1835,7 @@ jv jv_object_merge(jv a, jv b) { + assert(JVP_HAS_KIND(a, JV_KIND_OBJECT)); + jv_object_foreach(b, k, v) { + a = jv_object_set(a, k, v); ++ if (!jv_is_valid(a)) break; + } + jv_free(b); + return a; +@@ -1823,6 +1855,7 @@ jv jv_object_merge_recursive(jv a, jv b) { + jv_free(elem); + a = jv_object_set(a, k, v); + } ++ if (!jv_is_valid(a)) break; + } + jv_free(b); + return a; +diff --git a/src/jv_aux.c b/src/jv_aux.c +index 6004799..bbe1c0d 100644 +--- a/src/jv_aux.c ++++ b/src/jv_aux.c +@@ -193,18 +193,19 @@ jv jv_set(jv t, jv k, jv v) { + if (slice_len < insert_len) { + // array is growing + int shift = insert_len - slice_len; +- for (int i = array_len - 1; i >= end; i--) { ++ for (int i = array_len - 1; i >= end && jv_is_valid(t); i--) { + t = jv_array_set(t, i + shift, jv_array_get(jv_copy(t), i)); + } + } else if (slice_len > insert_len) { + // array is shrinking + int shift = slice_len - insert_len; +- for (int i = end; i < array_len; i++) { ++ for (int i = end; i < array_len && jv_is_valid(t); i++) { + t = jv_array_set(t, i - shift, jv_array_get(jv_copy(t), i)); + } +- t = jv_array_slice(t, 0, array_len - shift); ++ if (jv_is_valid(t)) ++ t = jv_array_slice(t, 0, array_len - shift); + } +- for (int i=0; i < insert_len; i++) { ++ for (int i = 0; i < insert_len && jv_is_valid(t); i++) { + t = jv_array_set(t, start + i, jv_array_get(jv_copy(v), i)); + } + jv_free(v); +diff --git a/tests/jq.test b/tests/jq.test +index d052b22..22bfd3a 100644 +--- a/tests/jq.test ++++ b/tests/jq.test +@@ -198,6 +198,10 @@ null + [0,1,2] + [0,5,2] + ++try (.[999999999] = 0) catch . ++null ++"Array index too large" ++ + # + # Multiple outputs, iteration + #
meta-oe/recipes-devtools/jq/jq/CVE-2024-53427.patch new file +82 -0
82 lines not on this page · raw message
meta-oe/recipes-devtools/jq/jq/CVE-2025-48060.patch new file +48 -0
48 lines not on this page · raw message
meta-oe/recipes-devtools/jq/jq_1.7.1.bb +3 -0
@@ -11,6 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=488f4e0b04c0456337fb70d1ac1758ba" GITHUB_BASE_URI = "https://github.com/jqlang/${BPN}/releases/" SRC_URI = "${GITHUB_BASE_URI}/download/${BPN}-${PV}/${BPN}-${PV}.tar.gz \ file://run-ptest \ + file://CVE-2024-23337.patch \ + file://CVE-2024-53427.patch \ + file://CVE-2025-48060.patch \ " SRC_URI[sha256sum] = "478c9ca129fd2e3443fe27314b455e211e0d8c60bc8ff7df703873deeee580c2"
Looks like v1 without Upstream-Status was merged to scarthgap, can you please rebase this v2 and send follow-up patch adding the Upstream-Status?
Quoted 27 lines · roland.kovacs via lists.openembedded.org
From: Roland Kovacs <[email protected]>
I forgot to run patchtest before sending v1, so this version includes the missing 'Upstream-Status' and 'CVE' fields in the added patch files.
Roland Kovacs (1):
jq-1.7.1: Backport multiple CVE fixes.../jq/jq/CVE-2024-23337.patch | 236 ++++++++++++++++++ .../jq/jq/CVE-2024-53427.patch | 82 ++++++ .../jq/jq/CVE-2025-48060.patch | 48 ++++ meta-oe/recipes-devtools/jq/jq_1.7.1.bb | 3 + 4 files changed, 369 insertions(+) create mode 100644 meta-oe/recipes-devtools/jq/jq/CVE-2024-23337.patch create mode 100644 meta-oe/recipes-devtools/jq/jq/CVE-2024-53427.patch create mode 100644 meta-oe/recipes-devtools/jq/jq/CVE-2025-48060.patch-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#118301): https://lists.openembedded.org/g/openembedded-devel/message/118301
Mute This Topic: https://lists.openembedded.org/mt/114042961/3617156
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Quoted 29 lines · Martin Jansa via lists.openembedded.org
Looks like v1 without Upstream-Status was merged to scarthgap, can you please rebase this v2 and send follow-up patch adding the Upstream-Status?
Quoted 9 lines · roland.kovacs via lists.openembedded.org
From: Roland Kovacs <[email protected]>
I forgot to run patchtest before sending v1, so this version includes the missing 'Upstream-Status' and 'CVE' fields in the added patch files.
Roland Kovacs (1):
jq-1.7.1: Backport multiple CVE fixesQuoted 12 lines
.../jq/jq/CVE-2024-23337.patch | 236 ++++++++++++++++++ .../jq/jq/CVE-2024-53427.patch | 82 ++++++ .../jq/jq/CVE-2025-48060.patch | 48 ++++ meta-oe/recipes-devtools/jq/jq_1.7.1.bb | 3 + 4 files changed, 369 insertions(+)create mode 100644
meta-oe/recipes-devtools/jq/jq/CVE-2024-23337.patchcreate mode 100644meta-oe/recipes-devtools/jq/jq/CVE-2024-53427.patchcreate mode 100644meta-oe/recipes-devtools/jq/jq/CVE-2025-48060.patch
Quoted 7 lines
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#118823): https://lists.openembedded.org/g/openembedded-devel/message/118823
Mute This Topic: https://lists.openembedded.org/mt/114042961/9897074
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Hi Martin,
I see you already sent the fix out. Thanks for spotting this and sorry for not picking it up in time.
Cheers,
Roland