From e09d2f7363e3346b0ecd7a05d7fcae7bf644dba8 Mon Sep 17 00:00:00 2001 From: wenyuzifang Date: Fri, 12 Dec 2025 18:06:10 +0800 Subject: [PATCH] Update code from upstream --- 0001-CVE-2024-23337.patch | 206 ++++++++++++++++++++++++++++++++++++++ jq.spec | 15 ++- 2 files changed, 216 insertions(+), 5 deletions(-) create mode 100644 0001-CVE-2024-23337.patch diff --git a/0001-CVE-2024-23337.patch b/0001-CVE-2024-23337.patch new file mode 100644 index 0000000..205d85c --- /dev/null +++ b/0001-CVE-2024-23337.patch @@ -0,0 +1,206 @@ +Based on: + +commit de21386681c0df0104a99d9d09db23a9b2a78b1e +Author: itchyny +Date: Wed May 21 07:45:00 2025 +0900 + + 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. + +diff -up jq-jq-1.7.1/src/jv_aux.c.orig jq-jq-1.7.1/src/jv_aux.c +--- jq-jq-1.7.1/src/jv_aux.c.orig 2023-12-13 20:20:22.000000000 +0100 ++++ jq-jq-1.7.1/src/jv_aux.c 2025-06-25 10:10:45.542441628 +0200 +@@ -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 -up jq-jq-1.7.1/src/jv.c.orig jq-jq-1.7.1/src/jv.c +--- jq-jq-1.7.1/src/jv.c.orig 2025-06-25 10:07:24.630147714 +0200 ++++ jq-jq-1.7.1/src/jv.c 2025-06-25 10:12:28.591914084 +0200 +@@ -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; +@@ -1292,6 +1298,7 @@ jv jv_string_indexes(jv j, jv k) { + p = jstr; + while ((p = _jq_memmem(p, (jstr + jlen) - p, idxstr, idxlen)) != NULL) { + a = jv_array_append(a, jv_number(p - jstr)); ++ if (!jv_is_valid(a)) break; + p++; + } + } +@@ -1314,14 +1321,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 +1349,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 +1626,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; ivalue; ++ *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 +1800,11 @@ jv jv_object_set(jv object, jv key, jv v + 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 +1829,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 +1849,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 -up jq-jq-1.7.1/tests/jq.test.orig jq-jq-1.7.1/tests/jq.test +--- jq-jq-1.7.1/tests/jq.test.orig 2025-06-25 10:07:24.630712938 +0200 ++++ jq-jq-1.7.1/tests/jq.test 2025-06-25 10:10:45.542877328 +0200 +@@ -198,6 +198,10 @@ null + [0,1,2] + [0,5,2] + ++try (.[999999999] = 0) catch . ++null ++"Array index too large" ++ + # + # Multiple outputs, iteration + # diff --git a/jq.spec b/jq.spec index 16dae8d..90d02ab 100644 --- a/jq.spec +++ b/jq.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 Name: jq Version: 1.7.1 Release: %{anolis_release}%{?dist} @@ -7,6 +7,8 @@ Summary: Command-line JSON processor License: MIT and ASL 2.0 and CC-BY and GPLv3 URL: https://jqlang.github.io/jq/ Source0: https://github.com/jqlang/jq/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz +Source1: 0001-CVE-2024-23337.patch +Patch0: 0001-CVE-2024-23337.patch BuildRequires: gcc BuildRequires: flex @@ -96,12 +98,15 @@ make check %{_libdir}/pkgconfig/libjq.pc %changelog -* Fri Feb 21 2025 Xiaoping Liu - 1.7.1-1 +* Fri Dec 12 2025 Xiaoping Liu - 1.7.1-2 +- Fix CVE-2024-23337 + +* Fri Feb 21 2025 Xiaoping Liu - 1.7.1-1 - update to 1.7.1 from 1.6 - Remove patches because the changes already exist upstream -* Mon Aug 12 2024 lidongyue - 1.6-16 +* Mon Aug 12 2024 lidongyue - 1.6-16 - Fix CVE-2023-49355 -* Tue Jan 24 2023 Funda Wang - 1.6-15 -- Import package for anolis 23 +* Tue Jan 24 2023 Funda Wang - 1.6-15 +- Import package for anolis 23 \ No newline at end of file -- Gitee