From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by mx.groups.io with SMTP id smtpd.web11.61963.1598903938889429921 for ; Mon, 31 Aug 2020 12:58:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20161025 header.b=pb/aYL1t; spf=pass (domain: gmail.com, ip: 209.85.215.194, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f194.google.com with SMTP id e33so1277654pgm.0 for ; Mon, 31 Aug 2020 12:58:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=rh3zrBL3ICiefClDTSIcwX/Ud/hsjqNgF1ezo/uqf9g=; b=pb/aYL1txdO7B9GzJ2ciGNjH52yqfWrc6YBrId/k9BIvFV0opIzJ2KfUAbjj+ZBrOG zGOEdz/ESXl1E4G700pru0KOgUiCGTsFo5j/FigCWz1fCCyP1wUGBBoGg6HdFjQdGQyC 3z/mYYqAxbRLKNnD/mldr6d1Lf/NeayF1t2xwka2XpapcXBLvJsrKlCuPQ65MfYKVZeW 31FhiBE4Ut+rRdp0EgJyyIJAJ5HGA1Y5P52tN505ZuSEbS9LncRr4IenFtuAyRW5QQA+ q37Cm0vgI7Os7G4STbLs6FAB5zEI6GeU+LwXex5inwsjXiaSLr0/MuVmGPwoBN7bIcyW w0GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=rh3zrBL3ICiefClDTSIcwX/Ud/hsjqNgF1ezo/uqf9g=; b=GrupSN9lX1khXGoaO7DBbzYs8X1T2JrFB9im/sOhOigGTP3xo0UtX48GV4rcTbobn0 7Y/H0tYLeb9uoJ+tWPlorDF4GrOevmE+YhVz6GVurWw7QG+d9vkipgUlc21P8lnU1e+s oAIrM7JHtZnmmmfZKoSxJcuJBpDCq9gI9NN583wEpR1GfeZo6A8wZUUsV7yUhAaq04G3 iE5naQgbIL5DcaOSYJwo5RkMOuMVxkTOR9UiTLihh8l5RD8ZCYAPnfRa0zjwGTm7LEEt sZXU46z3Nm4j94IguIKsBnT6FyVfZ5BO8OOVEfppbUwKypYFEyeUiwRBEmmlDRWwvu2d d9og== X-Gm-Message-State: AOAM533PT6hI1az2yMR1s0wsYh1Z6ilmGK3SIGuhp8xqG85bWNeFd/xl cSKSjykhc3/JLycIXBDOJY4P5/p/hcjS5A== X-Google-Smtp-Source: ABdhPJzaWV2dsiHuRsfjzAAH6uxWmvO1TKFcULqjeJzhFn9Yv/fsK7+o/WRu4FKAPoVJSJkGCvM/BQ== X-Received: by 2002:aa7:8b01:: with SMTP id f1mr2432485pfd.35.1598903937679; Mon, 31 Aug 2020 12:58:57 -0700 (PDT) Return-Path: Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:4e0::e89d]) by smtp.gmail.com with ESMTPSA id d1sm407884pjs.17.2020.08.31.12.58.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Aug 2020 12:58:57 -0700 (PDT) From: "Khem Raj" To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [dunfell][PATCH v2] json-c: Fix CVE-2020-12762 Date: Mon, 31 Aug 2020 12:58:54 -0700 Message-Id: <20200831195854.3585669-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Signed-off-by: Khem Raj --- v2: Resend .../json-c/json-c/CVE-2020-12762.patch | 231 ++++++++++++++++++ meta/recipes-devtools/json-c/json-c_0.13.1.bb | 1 + 2 files changed, 232 insertions(+) create mode 100644 meta/recipes-devtools/json-c/json-c/CVE-2020-12762.patch diff --git a/meta/recipes-devtools/json-c/json-c/CVE-2020-12762.patch b/met= a/recipes-devtools/json-c/json-c/CVE-2020-12762.patch new file mode 100644 index 0000000000..50674f0c5c --- /dev/null +++ b/meta/recipes-devtools/json-c/json-c/CVE-2020-12762.patch @@ -0,0 +1,231 @@ +From 865b5a65199973bb63dff8e47a2f57e04fec9736 Mon Sep 17 00:00:00 2001 +From: =3D?UTF-8?q?Bj=3DC3=3DB6rn=3D20Esser?=3D +Date: Thu, 14 May 2020 12:32:30 +0200 +Subject: [PATCH] Fix CVE-2020-12762. + +This commit is a squashed backport of the following commits +on the master branch: + + * 099016b7e8d70a6d5dd814e788bba08d33d48426 + * 77d935b7ae7871a1940cd827e850e6063044ec45 + * d07b91014986900a3a75f306d302e13e005e9d67 + * 519dfe1591d85432986f9762d41d1a883198c157 + * a59d5acfab4485d5133114df61785b1fc633e0c6 +--- +CVE: CVE-2020-12762 +Upstream-Status: Backport [https://github.com/json-c/json-c/commit/865b5a6= 5199973bb63dff8e47a2f57e04fec9736] +Signed-off-by: Khem Raj + + arraylist.c | 3 +++ + linkhash.c | 21 ++++++++++++++------- + printbuf.c | 38 ++++++++++++++++++++++++++------------ + tests/test4.c | 30 +++++++++++++++++++++++++++++- + tests/test4.expected | 1 + + 5 files changed, 73 insertions(+), 20 deletions(-) + +diff --git a/arraylist.c b/arraylist.c +index ddeb8d4eb4..e737052e32 100644 +--- a/arraylist.c ++++ b/arraylist.c +@@ -135,6 +135,9 @@ array_list_del_idx( struct array_list *arr, size_t idx= , size_t count ) + { + size_t i, stop; +=20 ++ /* Avoid overflow in calculation with large indices. */ ++ if (idx > SIZE_T_MAX - count) ++ return -1; + stop =3D idx + count; + if ( idx >=3D arr->length || stop > arr->length ) return -1; + for ( i =3D idx; i < stop; ++i ) { +diff --git a/linkhash.c b/linkhash.c +index 5497061a8a..6435a154ac 100644 +--- a/linkhash.c ++++ b/linkhash.c +@@ -12,12 +12,13 @@ +=20 + #include "config.h" +=20 +-#include +-#include +-#include ++#include ++#include + #include + #include +-#include ++#include ++#include ++#include +=20 + #ifdef HAVE_ENDIAN_H + # include /* attempt to define endianness */ +@@ -28,8 +29,8 @@ + # include /* Get InterlockedCompareExchange */ + #endif +=20 +-#include "random_seed.h" + #include "linkhash.h" ++#include "random_seed.h" +=20 + /* hash functions */ + static unsigned long lh_char_hash(const void *k); +@@ -498,7 +499,9 @@ struct lh_table* lh_table_new(int size, + int i; + struct lh_table *t; +=20 +- t =3D (struct lh_table*)calloc(1, sizeof(struct lh_table)); ++ /* Allocate space for elements to avoid divisions by zero. */ ++ assert(size > 0); ++ t =3D (struct lh_table *)calloc(1, sizeof(struct lh_table)); + if (!t) + return NULL; +=20 +@@ -577,8 +580,12 @@ int lh_table_insert_w_hash(struct lh_table *t, const = void *k, const void *v, con + unsigned long n; +=20 + if (t->count >=3D t->size * LH_LOAD_FACTOR) +- if (lh_table_resize(t, t->size * 2) !=3D 0) ++ { ++ /* Avoid signed integer overflow with large tables. */ ++ int new_size =3D (t->size > INT_MAX / 2) ? INT_MAX : (t->size * 2); ++ if (t->size =3D=3D INT_MAX || lh_table_resize(t, new_size) !=3D 0) + return -1; ++ } +=20 + n =3D h % t->size; +=20 +diff --git a/printbuf.c b/printbuf.c +index 6c77b5defd..6fc56de455 100644 +--- a/printbuf.c ++++ b/printbuf.c +@@ -15,6 +15,7 @@ +=20 + #include "config.h" +=20 ++#include + #include + #include + #include +@@ -64,10 +65,16 @@ static int printbuf_extend(struct printbuf *p, int min= _size) +=20 + if (p->size >=3D min_size) + return 0; +- +- new_size =3D p->size * 2; +- if (new_size < min_size + 8) +- new_size =3D min_size + 8; ++ /* Prevent signed integer overflows with large buffers. */ ++ if (min_size > INT_MAX - 8) ++ return -1; ++ if (p->size > INT_MAX / 2) ++ new_size =3D min_size + 8; ++ else { ++ new_size =3D p->size * 2; ++ if (new_size < min_size + 8) ++ new_size =3D min_size + 8; ++ } + #ifdef PRINTBUF_DEBUG + MC_DEBUG("printbuf_memappend: realloc " + "bpos=3D%d min_size=3D%d old_size=3D%d new_size=3D%d\n", +@@ -82,14 +89,18 @@ static int printbuf_extend(struct printbuf *p, int min= _size) +=20 + int printbuf_memappend(struct printbuf *p, const char *buf, int size) + { +- if (p->size <=3D p->bpos + size + 1) { +- if (printbuf_extend(p, p->bpos + size + 1) < 0) +- return -1; +- } +- memcpy(p->buf + p->bpos, buf, size); +- p->bpos +=3D size; +- p->buf[p->bpos]=3D '\0'; +- return size; ++ /* Prevent signed integer overflows with large buffers. */ ++ if (size > INT_MAX - p->bpos - 1) ++ return -1; ++ if (p->size <=3D p->bpos + size + 1) ++ { ++ if (printbuf_extend(p, p->bpos + size + 1) < 0) ++ return -1; ++ } ++ memcpy(p->buf + p->bpos, buf, size); ++ p->bpos +=3D size; ++ p->buf[p->bpos] =3D '\0'; ++ return size; + } +=20 + int printbuf_memset(struct printbuf *pb, int offset, int charvalue, int l= en) +@@ -98,6 +109,9 @@ int printbuf_memset(struct printbuf *pb, int offset, in= t charvalue, int len) +=20 + if (offset =3D=3D -1) + offset =3D pb->bpos; ++ /* Prevent signed integer overflows with large buffers. */ ++ if (len > INT_MAX - offset) ++ return -1; + size_needed =3D offset + len; + if (pb->size < size_needed) + { +diff --git a/tests/test4.c b/tests/test4.c +index fc8b79dbf4..82d3f494de 100644 +--- a/tests/test4.c ++++ b/tests/test4.c +@@ -2,9 +2,11 @@ + * gcc -o utf8 utf8.c -I/home/y/include -L./.libs -ljson + */ +=20 ++#include "config.h" ++#include + #include ++#include + #include +-#include "config.h" +=20 + #include "json_inttypes.h" + #include "json_object.h" +@@ -24,6 +26,29 @@ void print_hex(const char* s) + putchar('\n'); + } +=20 ++static void test_lot_of_adds(void); ++static void test_lot_of_adds() ++{ ++ int ii; ++ char key[50]; ++ json_object *jobj =3D json_object_new_object(); ++ assert(jobj !=3D NULL); ++ for (ii =3D 0; ii < 500; ii++) ++ { ++ snprintf(key, sizeof(key), "k%d", ii); ++ json_object *iobj =3D json_object_new_int(ii); ++ assert(iobj !=3D NULL); ++ if (json_object_object_add(jobj, key, iobj)) ++ { ++ fprintf(stderr, "FAILED to add object #%d\n", ii); ++ abort(); ++ } ++ } ++ printf("%s\n", json_object_to_json_string(jobj)); ++ assert(json_object_object_length(jobj) =3D=3D 500); ++ json_object_put(jobj); ++} ++ + int main(void) + { + const char *input =3D "\"\\ud840\\udd26,\\ud840\\udd27,\\ud800\\udd26,\\= ud800\\udd27\""; +@@ -49,5 +74,8 @@ int main(void) + retval =3D 1; + } + json_object_put(parse_result); ++ ++ test_lot_of_adds(); ++ + return retval; + } +diff --git a/tests/test4.expected b/tests/test4.expected +index 68d4336d90..cb2744012b 100644 +--- a/tests/test4.expected ++++ b/tests/test4.expected +@@ -1,3 +1,4 @@ + input: "\ud840\udd26,\ud840\udd27,\ud800\udd26,\ud800\udd27" + JSON parse result is correct: =F0=A0=84=A6,=F0=A0=84=A7,=F0=90=84=A6,=F0= =90=84=A7 + PASS ++{ "k0": 0, "k1": 1, "k2": 2, "k3": 3, "k4": 4, "k5": 5, "k6": 6, "k7": 7,= "k8": 8, "k9": 9, "k10": 10, "k11": 11, "k12": 12, "k13": 13, "k14": 14, "= k15": 15, "k16": 16, "k17": 17, "k18": 18, "k19": 19, "k20": 20, "k21": 21,= "k22": 22, "k23": 23, "k24": 24, "k25": 25, "k26": 26, "k27": 27, "k28": 2= 8, "k29": 29, "k30": 30, "k31": 31, "k32": 32, "k33": 33, "k34": 34, "k35":= 35, "k36": 36, "k37": 37, "k38": 38, "k39": 39, "k40": 40, "k41": 41, "k42= ": 42, "k43": 43, "k44": 44, "k45": 45, "k46": 46, "k47": 47, "k48": 48, "k= 49": 49, "k50": 50, "k51": 51, "k52": 52, "k53": 53, "k54": 54, "k55": 55, = "k56": 56, "k57": 57, "k58": 58, "k59": 59, "k60": 60, "k61": 61, "k62": 62= , "k63": 63, "k64": 64, "k65": 65, "k66": 66, "k67": 67, "k68": 68, "k69": = 69, "k70": 70, "k71": 71, "k72": 72, "k73": 73, "k74": 74, "k75": 75, "k76"= : 76, "k77": 77, "k78": 78, "k79": 79, "k80": 80, "k81": 81, "k82": 82, "k8= 3": 83, "k84": 84, "k85": 85, "k86": 86, "k87": 87, "k88": 88, "k89": 89, "= k90": 90, "k91": 91, "k92": 92, "k93": 93, "k94": 94, "k95": 95, "k96": 96,= "k97": 97, "k98": 98, "k99": 99, "k100": 100, "k101": 101, "k102": 102, "k= 103": 103, "k104": 104, "k105": 105, "k106": 106, "k107": 107, "k108": 108,= "k109": 109, "k110": 110, "k111": 111, "k112": 112, "k113": 113, "k114": 1= 14, "k115": 115, "k116": 116, "k117": 117, "k118": 118, "k119": 119, "k120"= : 120, "k121": 121, "k122": 122, "k123": 123, "k124": 124, "k125": 125, "k1= 26": 126, "k127": 127, "k128": 128, "k129": 129, "k130": 130, "k131": 131, = "k132": 132, "k133": 133, "k134": 134, "k135": 135, "k136": 136, "k137": 13= 7, "k138": 138, "k139": 139, "k140": 140, "k141": 141, "k142": 142, "k143":= 143, "k144": 144, "k145": 145, "k146": 146, "k147": 147, "k148": 148, "k14= 9": 149, "k150": 150, "k151": 151, "k152": 152, "k153": 153, "k154": 154, "= k155": 155, "k156": 156, "k157": 157, "k158": 158, "k159": 159, "k160": 160= , "k161": 161, "k162": 162, "k163": 163, "k164": 164, "k165": 165, "k166": = 166, "k167": 167, "k168": 168, "k169": 169, "k170": 170, "k171": 171, "k172= ": 172, "k173": 173, "k174": 174, "k175": 175, "k176": 176, "k177": 177, "k= 178": 178, "k179": 179, "k180": 180, "k181": 181, "k182": 182, "k183": 183,= "k184": 184, "k185": 185, "k186": 186, "k187": 187, "k188": 188, "k189": 1= 89, "k190": 190, "k191": 191, "k192": 192, "k193": 193, "k194": 194, "k195"= : 195, "k196": 196, "k197": 197, "k198": 198, "k199": 199, "k200": 200, "k2= 01": 201, "k202": 202, "k203": 203, "k204": 204, "k205": 205, "k206": 206, = "k207": 207, "k208": 208, "k209": 209, "k210": 210, "k211": 211, "k212": 21= 2, "k213": 213, "k214": 214, "k215": 215, "k216": 216, "k217": 217, "k218":= 218, "k219": 219, "k220": 220, "k221": 221, "k222": 222, "k223": 223, "k22= 4": 224, "k225": 225, "k226": 226, "k227": 227, "k228": 228, "k229": 229, "= k230": 230, "k231": 231, "k232": 232, "k233": 233, "k234": 234, "k235": 235= , "k236": 236, "k237": 237, "k238": 238, "k239": 239, "k240": 240, "k241": = 241, "k242": 242, "k243": 243, "k244": 244, "k245": 245, "k246": 246, "k247= ": 247, "k248": 248, "k249": 249, "k250": 250, "k251": 251, "k252": 252, "k= 253": 253, "k254": 254, "k255": 255, "k256": 256, "k257": 257, "k258": 258,= "k259": 259, "k260": 260, "k261": 261, "k262": 262, "k263": 263, "k264": 2= 64, "k265": 265, "k266": 266, "k267": 267, "k268": 268, "k269": 269, "k270"= : 270, "k271": 271, "k272": 272, "k273": 273, "k274": 274, "k275": 275, "k2= 76": 276, "k277": 277, "k278": 278, "k279": 279, "k280": 280, "k281": 281, = "k282": 282, "k283": 283, "k284": 284, "k285": 285, "k286": 286, "k287": 28= 7, "k288": 288, "k289": 289, "k290": 290, "k291": 291, "k292": 292, "k293":= 293, "k294": 294, "k295": 295, "k296": 296, "k297": 297, "k298": 298, "k29= 9": 299, "k300": 300, "k301": 301, "k302": 302, "k303": 303, "k304": 304, "= k305": 305, "k306": 306, "k307": 307, "k308": 308, "k309": 309, "k310": 310= , "k311": 311, "k312": 312, "k313": 313, "k314": 314, "k315": 315, "k316": = 316, "k317": 317, "k318": 318, "k319": 319, "k320": 320, "k321": 321, "k322= ": 322, "k323": 323, "k324": 324, "k325": 325, "k326": 326, "k327": 327, "k= 328": 328, "k329": 329, "k330": 330, "k331": 331, "k332": 332, "k333": 333,= "k334": 334, "k335": 335, "k336": 336, "k337": 337, "k338": 338, "k339": 3= 39, "k340": 340, "k341": 341, "k342": 342, "k343": 343, "k344": 344, "k345"= : 345, "k346": 346, "k347": 347, "k348": 348, "k349": 349, "k350": 350, "k3= 51": 351, "k352": 352, "k353": 353, "k354": 354, "k355": 355, "k356": 356, = "k357": 357, "k358": 358, "k359": 359, "k360": 360, "k361": 361, "k362": 36= 2, "k363": 363, "k364": 364, "k365": 365, "k366": 366, "k367": 367, "k368":= 368, "k369": 369, "k370": 370, "k371": 371, "k372": 372, "k373": 373, "k37= 4": 374, "k375": 375, "k376": 376, "k377": 377, "k378": 378, "k379": 379, "= k380": 380, "k381": 381, "k382": 382, "k383": 383, "k384": 384, "k385": 385= , "k386": 386, "k387": 387, "k388": 388, "k389": 389, "k390": 390, "k391": = 391, "k392": 392, "k393": 393, "k394": 394, "k395": 395, "k396": 396, "k397= ": 397, "k398": 398, "k399": 399, "k400": 400, "k401": 401, "k402": 402, "k= 403": 403, "k404": 404, "k405": 405, "k406": 406, "k407": 407, "k408": 408,= "k409": 409, "k410": 410, "k411": 411, "k412": 412, "k413": 413, "k414": 4= 14, "k415": 415, "k416": 416, "k417": 417, "k418": 418, "k419": 419, "k420"= : 420, "k421": 421, "k422": 422, "k423": 423, "k424": 424, "k425": 425, "k4= 26": 426, "k427": 427, "k428": 428, "k429": 429, "k430": 430, "k431": 431, = "k432": 432, "k433": 433, "k434": 434, "k435": 435, "k436": 436, "k437": 43= 7, "k438": 438, "k439": 439, "k440": 440, "k441": 441, "k442": 442, "k443":= 443, "k444": 444, "k445": 445, "k446": 446, "k447": 447, "k448": 448, "k44= 9": 449, "k450": 450, "k451": 451, "k452": 452, "k453": 453, "k454": 454, "= k455": 455, "k456": 456, "k457": 457, "k458": 458, "k459": 459, "k460": 460= , "k461": 461, "k462": 462, "k463": 463, "k464": 464, "k465": 465, "k466": = 466, "k467": 467, "k468": 468, "k469": 469, "k470": 470, "k471": 471, "k472= ": 472, "k473": 473, "k474": 474, "k475": 475, "k476": 476, "k477": 477, "k= 478": 478, "k479": 479, "k480": 480, "k481": 481, "k482": 482, "k483": 483,= "k484": 484, "k485": 485, "k486": 486, "k487": 487, "k488": 488, "k489": 4= 89, "k490": 490, "k491": 491, "k492": 492, "k493": 493, "k494": 494, "k495"= : 495, "k496": 496, "k497": 497, "k498": 498, "k499": 499 } diff --git a/meta/recipes-devtools/json-c/json-c_0.13.1.bb b/meta/recipes-d= evtools/json-c/json-c_0.13.1.bb index 522879f21f..c7c755bb16 100644 --- a/meta/recipes-devtools/json-c/json-c_0.13.1.bb +++ b/meta/recipes-devtools/json-c/json-c_0.13.1.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM =3D "file://COPYING;md5=3Dde54b60fbbc35123= ba193fea8ee216f2" =20 SRC_URI =3D "https://s3.amazonaws.com/json-c_releases/releases/${BP}.tar.g= z \ file://add-disable-werror-option-to-configure.patch \ + file://CVE-2020-12762.patch \ " SRC_URI[md5sum] =3D "04969ad59cc37bddd83741a08b98f350" SRC_URI[sha256sum] =3D "b87e608d4d3f7bfdd36ef78d56d53c74e66ab278d318b71e60= 02a369d36f4873" --=20 2.28.0