diff options
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/tar/files/CVE-2022-48303.patch | 36 | ||||
-rw-r--r-- | meta/recipes-extended/tar/tar/CVE-2022-48303.patch | 43 | ||||
-rw-r--r-- | meta/recipes-extended/tar/tar_1.34.bb | 2 |
3 files changed, 44 insertions, 37 deletions
diff --git a/meta/recipes-extended/tar/files/CVE-2022-48303.patch b/meta/recipes-extended/tar/files/CVE-2022-48303.patch deleted file mode 100644 index a8e9f4ac7d..0000000000 --- a/meta/recipes-extended/tar/files/CVE-2022-48303.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | From 1d530107a24d71e798727d7f0afa0833473d1074 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Matej=20Mu=C5=BEila?= <mmuzila@gmail.com> | ||
3 | Date: Wed, 11 Jan 2023 08:55:58 +0100 | ||
4 | Subject: [PATCH] Fix savannah bug #62387 | ||
5 | |||
6 | * src/list.c (from_header): Check for the end of field after leading byte | ||
7 | (0x80 or 0xff) of base-256 encoded header value | ||
8 | |||
9 | Upstream-Status: Backport | ||
10 | [https://savannah.gnu.org/patch/download.php?file_id=54212] | ||
11 | CVE: CVE-2022-48303 | ||
12 | Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> | ||
13 | --- | ||
14 | src/list.c | 6 ++++++ | ||
15 | 1 file changed, 6 insertions(+) | ||
16 | |||
17 | diff --git a/src/list.c b/src/list.c | ||
18 | index 9fafc425..bf41b581 100644 | ||
19 | --- a/src/list.c | ||
20 | +++ b/src/list.c | ||
21 | @@ -895,6 +895,12 @@ from_header (char const *where0, size_t digs, char const *type, | ||
22 | << (CHAR_BIT * sizeof (uintmax_t) | ||
23 | - LG_256 - (LG_256 - 2))); | ||
24 | value = (*where++ & ((1 << (LG_256 - 2)) - 1)) - signbit; | ||
25 | + if (where == lim) | ||
26 | + { | ||
27 | + if (type && !silent) | ||
28 | + ERROR ((0, 0, _("Archive base-256 value is invalid"))); | ||
29 | + return -1; | ||
30 | + } | ||
31 | for (;;) | ||
32 | { | ||
33 | value = (value << LG_256) + (unsigned char) *where++; | ||
34 | -- | ||
35 | 2.38.1 | ||
36 | |||
diff --git a/meta/recipes-extended/tar/tar/CVE-2022-48303.patch b/meta/recipes-extended/tar/tar/CVE-2022-48303.patch new file mode 100644 index 0000000000..b2f40f3e64 --- /dev/null +++ b/meta/recipes-extended/tar/tar/CVE-2022-48303.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | From 3da78400eafcccb97e2f2fd4b227ea40d794ede8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Sergey Poznyakoff <gray@gnu.org> | ||
3 | Date: Sat, 11 Feb 2023 11:57:39 +0200 | ||
4 | Subject: Fix boundary checking in base-256 decoder | ||
5 | |||
6 | * src/list.c (from_header): Base-256 encoding is at least 2 bytes | ||
7 | long. | ||
8 | |||
9 | Upstream-Status: Backport [see reference below] | ||
10 | CVE: CVE-2022-48303 | ||
11 | |||
12 | Reference to upstream patch: | ||
13 | https://savannah.gnu.org/bugs/?62387 | ||
14 | https://git.savannah.gnu.org/cgit/tar.git/patch/src/list.c?id=3da78400eafcccb97e2f2fd4b227ea40d794ede8 | ||
15 | |||
16 | Signed-off-by: Rodolfo Quesada Zumbado <rodolfo.zumbado@windriver.com> | ||
17 | Signed-off-by: Joe Slater <joe.slater@windriver.com> | ||
18 | --- | ||
19 | src/list.c | 5 +++-- | ||
20 | 1 file changed, 3 insertions(+), 2 deletions(-)Signed-off-by: Rodolfo Quesada Zumbado <rodolfo.zumbado@windriver.com> | ||
21 | |||
22 | |||
23 | (limited to 'src/list.c') | ||
24 | |||
25 | diff --git a/src/list.c b/src/list.c | ||
26 | index 9fafc42..86bcfdd 100644 | ||
27 | --- a/src/list.c | ||
28 | +++ b/src/list.c | ||
29 | @@ -881,8 +881,9 @@ from_header (char const *where0, size_t digs, char const *type, | ||
30 | where++; | ||
31 | } | ||
32 | } | ||
33 | - else if (*where == '\200' /* positive base-256 */ | ||
34 | - || *where == '\377' /* negative base-256 */) | ||
35 | + else if (where <= lim - 2 | ||
36 | + && (*where == '\200' /* positive base-256 */ | ||
37 | + || *where == '\377' /* negative base-256 */)) | ||
38 | { | ||
39 | /* Parse base-256 output. A nonnegative number N is | ||
40 | represented as (256**DIGS)/2 + N; a negative number -N is | ||
41 | -- | ||
42 | cgit v1.1 | ||
43 | |||
diff --git a/meta/recipes-extended/tar/tar_1.34.bb b/meta/recipes-extended/tar/tar_1.34.bb index 22c04ba70a..1ef5fe221e 100644 --- a/meta/recipes-extended/tar/tar_1.34.bb +++ b/meta/recipes-extended/tar/tar_1.34.bb | |||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | |||
8 | 8 | ||
9 | SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2 \ | 9 | SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2 \ |
10 | file://CVE-2022-48303.patch \ | 10 | file://CVE-2022-48303.patch \ |
11 | " | 11 | " |
12 | 12 | ||
13 | SRC_URI[sha256sum] = "b44cc67f8a1f6b0250b7c860e952b37e8ed932a90bd9b1862a511079255646ff" | 13 | SRC_URI[sha256sum] = "b44cc67f8a1f6b0250b7c860e952b37e8ed932a90bd9b1862a511079255646ff" |
14 | 14 | ||