summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/tar
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2023-08-01 15:41:18 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-08-21 11:34:12 +0100
commit90801cd8cb23719031aaaba1578a8446e1824cad (patch)
tree305bb16d4a17a5c483833fcc5e171c08eea1ade6 /meta/recipes-extended/tar
parentcfc13491e423462ee162e9fc969087bfa4feb025 (diff)
downloadpoky-90801cd8cb23719031aaaba1578a8446e1824cad.tar.gz
tar: upgrade 1.34 -> 1.35
CVE-2022-48303.patch removed since it's included in 1.35 License-Update: http changed to https Changelog: =========== * Fail when building GNU tar, if the platform supports 64-bit time_t but the build uses only 32-bit time_t. * Leave the devmajor and devminor fields empty (rather than zero) for non-special files, as this is more compatible with traditional tar. * Bug fixes ** Fix interaction of --update with --wildcards. ** When extracting archives into an empty directory, do not create hard links to files outside that directory. ** Handle partial reads from regular files. ** Warn "file changed as we read it" less often. ** Fix --ignore-failed-read to ignore file-changed read errors ** Fix --remove-files to not remove a file that changed while we read it. ** Fix --atime-preserve=replace to not fail if there was no need to replace, either because we did not read the file, or the atime did not change. ** Fix race when creating a parent directory while another process is also doing so. ** Fix handling of prefix keywords not followed by "." in pax headers. ** Fix handling of out-of-range sparse entries in pax headers. ** Fix handling of --transform='s/s/@/2'. ** Fix treatment of options ending in / in files-from list. ** Fix crash on 'tar --checkpoint-action exec=\"'. ** Fix low-memory crash when reading incremental dumps. ** Fix --exclude-vcs-ignores memory allocation misuse. (From OE-Core rev: c63769de05ce08c0627d302d14316ced31816b4d) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/tar')
-rw-r--r--meta/recipes-extended/tar/tar/CVE-2022-48303.patch43
-rw-r--r--meta/recipes-extended/tar/tar_1.35.bb (renamed from meta/recipes-extended/tar/tar_1.34.bb)8
2 files changed, 3 insertions, 48 deletions
diff --git a/meta/recipes-extended/tar/tar/CVE-2022-48303.patch b/meta/recipes-extended/tar/tar/CVE-2022-48303.patch
deleted file mode 100644
index b2f40f3e64..0000000000
--- a/meta/recipes-extended/tar/tar/CVE-2022-48303.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1From 3da78400eafcccb97e2f2fd4b227ea40d794ede8 Mon Sep 17 00:00:00 2001
2From: Sergey Poznyakoff <gray@gnu.org>
3Date: Sat, 11 Feb 2023 11:57:39 +0200
4Subject: Fix boundary checking in base-256 decoder
5
6* src/list.c (from_header): Base-256 encoding is at least 2 bytes
7long.
8
9Upstream-Status: Backport [see reference below]
10CVE: CVE-2022-48303
11
12Reference to upstream patch:
13https://savannah.gnu.org/bugs/?62387
14https://git.savannah.gnu.org/cgit/tar.git/patch/src/list.c?id=3da78400eafcccb97e2f2fd4b227ea40d794ede8
15
16Signed-off-by: Rodolfo Quesada Zumbado <rodolfo.zumbado@windriver.com>
17Signed-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
25diff --git a/src/list.c b/src/list.c
26index 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--
42cgit v1.1
43
diff --git a/meta/recipes-extended/tar/tar_1.34.bb b/meta/recipes-extended/tar/tar_1.35.bb
index 1ef5fe221e..4dbd418b60 100644
--- a/meta/recipes-extended/tar/tar_1.34.bb
+++ b/meta/recipes-extended/tar/tar_1.35.bb
@@ -4,13 +4,11 @@ or disk archive, and can restore individual files from the archive."
4HOMEPAGE = "http://www.gnu.org/software/tar/" 4HOMEPAGE = "http://www.gnu.org/software/tar/"
5SECTION = "base" 5SECTION = "base"
6LICENSE = "GPL-3.0-only" 6LICENSE = "GPL-3.0-only"
7LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 7LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464"
8 8
9SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2 \ 9SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2"
10 file://CVE-2022-48303.patch \
11"
12 10
13SRC_URI[sha256sum] = "b44cc67f8a1f6b0250b7c860e952b37e8ed932a90bd9b1862a511079255646ff" 11SRC_URI[sha256sum] = "7edb8886a3dc69420a1446e1e2d061922b642f1cf632d2cd0f9ee7e690775985"
14 12
15inherit autotools gettext texinfo 13inherit autotools gettext texinfo
16 14