diff --git a/backport-CVE-2022-48303.patch b/backport-CVE-2022-48303.patch new file mode 100644 index 0000000000000000000000000000000000000000..a1889781e709139eecd72d4f0e56f2741603b8ef --- /dev/null +++ b/backport-CVE-2022-48303.patch @@ -0,0 +1,31 @@ +From 1d530107a24d71e798727d7f0afa0833473d1074 Mon Sep 17 00:00:00 2001 +From: Matej Mužila +Date: Wed, 11 Jan 2023 08:55:58 +0100 +Subject: [PATCH] Fix savannah bug #62387 + +* src/list.c (from_header): Check for the end of field after leading byte + (0x80 or 0xff) of base-256 encoded header value +--- + src/list.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/list.c b/src/list.c +index 9fafc425..bf41b581 100644 +--- a/src/list.c ++++ b/src/list.c +@@ -899,6 +899,12 @@ from_header (char const *where0, size_t digs, char const *type, + << (CHAR_BIT * sizeof (uintmax_t) + - LG_256 - (LG_256 - 2))); + value = (*where++ & ((1 << (LG_256 - 2)) - 1)) - signbit; ++ if (where == lim) ++ { ++ if (type && !silent) ++ ERROR ((0, 0, _("Archive base-256 value is invalid"))); ++ return -1; ++ } + for (;;) + { + value = (value << LG_256) + (unsigned char) *where++; +-- +2.38.1 + diff --git a/tar.spec b/tar.spec index b536f629e2531a15e36f8219c69c44a6408157bd..78ce5a3e93cfe850d49071aa8098e9cc60b9c40a 100644 --- a/tar.spec +++ b/tar.spec @@ -1,6 +1,6 @@ Name: tar Version: 1.34 -Release: 3 +Release: 4 Epoch: 2 Summary: An organized and systematic method of controlling a large amount of data License: GPLv3+ @@ -12,6 +12,8 @@ BuildRequires: autoconf automake texinfo gettext libacl-devel attr acl policycor BuildRequires: gcc Provides: bundled(gnulib) /bin/tar /bin/gtar +Patch6000: backport-CVE-2022-48303.patch + Patch0001: tar-1.28-loneZeroWarning.patch Patch0002: tar-1.28-vfatTruncate.patch Patch0003: tar-1.29-wildcards.patch @@ -76,6 +78,9 @@ make check %{_infodir}/tar.info* %changelog +* Wed Feb 08 2023 wangjiang 2:1.34-4 +- fix CVE-2022-48303 + * Fri Nov 11 2022 wuzx - 2:1.34-3 - Add sw64 architecture