json-c: fix CVE-2021-32292

This is a read past end of buffer issue in the json_parse test app,
which can happened with malformed json data. It's not an issue with the
library itself. For what ever reason this CVE has a base score of 9.8.

Reference:
https://nvd.nist.gov/vuln/detail/CVE-2021-32292

Upstream issue:
https://github.com/json-c/json-c/issues/654

The CVE is fixed with version 0.16 (which is already in all active
branches of poky).

(From OE-Core rev: a7b93651028b55d71b8db53ea831eee7fd539f33)

Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
Adrian Freihofer
2023-08-29 19:00:46 +02:00
committed by Steve Sakoman
parent be24e22651
commit d01be5cf84
2 changed files with 31 additions and 0 deletions

View File

@@ -0,0 +1,30 @@
From da22ae6541584068f8169315274016920da11d8b Mon Sep 17 00:00:00 2001
From: Marc <34656315+MarcT512@users.noreply.github.com>
Date: Fri, 7 Aug 2020 10:49:45 +0100
Subject: [PATCH] Fix read past end of buffer
Fixes: CVE-2021-32292
Issue: https://github.com/json-c/json-c/issues/654
Upstream-Status: Backport [4e9e44e5258dee7654f74948b0dd5da39c28beec]
CVE: CVE-2021-32292
Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com>
---
apps/json_parse.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/apps/json_parse.c b/apps/json_parse.c
index bba4622..72b31a8 100644
--- a/apps/json_parse.c
+++ b/apps/json_parse.c
@@ -82,7 +82,8 @@ static int parseit(int fd, int (*callback)(struct json_object *))
int parse_end = json_tokener_get_parse_end(tok);
if (obj == NULL && jerr != json_tokener_continue)
{
- char *aterr = &buf[start_pos + parse_end];
+ char *aterr = (start_pos + parse_end < sizeof(buf)) ?
+ &buf[start_pos + parse_end] : "";
fflush(stdout);
int fail_offset = total_read - ret + start_pos + parse_end;
fprintf(stderr, "Failed at offset %d: %s %c\n", fail_offset,

View File

@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2"
SRC_URI = " \
https://s3.amazonaws.com/json-c_releases/releases/${BP}.tar.gz \
file://run-ptest \
file://CVE-2021-32292.patch \
"
SRC_URI[sha256sum] = "b8d80a1ddb718b3ba7492916237bbf86609e9709fb007e7f7d4322f02341a4c6"