From 42939132062862f58736acf6a9e548f00f0e7896 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Wed, 8 Jun 2022 04:21:00 -0400 Subject: [PATCH] import xz-5.2.5-8.el9_0 --- SOURCES/xz-5.2.5-cve-2022-1271.patch | 94 ++++++++++++++++++++++++++++ SPECS/xz.spec | 7 ++- 2 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 SOURCES/xz-5.2.5-cve-2022-1271.patch diff --git a/SOURCES/xz-5.2.5-cve-2022-1271.patch b/SOURCES/xz-5.2.5-cve-2022-1271.patch new file mode 100644 index 0000000..406ded5 --- /dev/null +++ b/SOURCES/xz-5.2.5-cve-2022-1271.patch @@ -0,0 +1,94 @@ +From 69d1b3fc29677af8ade8dc15dba83f0589cb63d6 Mon Sep 17 00:00:00 2001 +From: Lasse Collin +Date: Tue, 29 Mar 2022 19:19:12 +0300 +Subject: [PATCH] xzgrep: Fix escaping of malicious filenames (ZDI-CAN-16587). + +Malicious filenames can make xzgrep to write to arbitrary files +or (with a GNU sed extension) lead to arbitrary code execution. + +xzgrep from XZ Utils versions up to and including 5.2.5 are +affected. 5.3.1alpha and 5.3.2alpha are affected as well. +This patch works for all of them. + +This bug was inherited from gzip's zgrep. gzip 1.12 includes +a fix for zgrep. + +The issue with the old sed script is that with multiple newlines, +the N-command will read the second line of input, then the +s-commands will be skipped because it's not the end of the +file yet, then a new sed cycle starts and the pattern space +is printed and emptied. So only the last line or two get escaped. + +One way to fix this would be to read all lines into the pattern +space first. However, the included fix is even simpler: All lines +except the last line get a backslash appended at the end. To ensure +that shell command substitution doesn't eat a possible trailing +newline, a colon is appended to the filename before escaping. +The colon is later used to separate the filename from the grep +output so it is fine to add it here instead of a few lines later. + +The old code also wasn't POSIX compliant as it used \n in the +replacement section of the s-command. Using \ is the +POSIX compatible method. + +LC_ALL=C was added to the two critical sed commands. POSIX sed +manual recommends it when using sed to manipulate pathnames +because in other locales invalid multibyte sequences might +cause issues with some sed implementations. In case of GNU sed, +these particular sed scripts wouldn't have such problems but some +other scripts could have, see: + + info '(sed)Locale Considerations' + +This vulnerability was discovered by: +cleemy desu wayo working with Trend Micro Zero Day Initiative + +Thanks to Jim Meyering and Paul Eggert discussing the different +ways to fix this and for coordinating the patch release schedule +with gzip. +--- + src/scripts/xzgrep.in | 20 ++++++++++++-------- + 1 file changed, 12 insertions(+), 8 deletions(-) + +diff --git a/src/scripts/xzgrep.in b/src/scripts/xzgrep.in +index b180936..e5186ba 100644 +--- a/src/scripts/xzgrep.in ++++ b/src/scripts/xzgrep.in +@@ -180,22 +180,26 @@ for i; do + { test $# -eq 1 || test $no_filename -eq 1; }; then + eval "$grep" + else ++ # Append a colon so that the last character will never be a newline ++ # which would otherwise get lost in shell command substitution. ++ i="$i:" ++ ++ # Escape & \ | and newlines only if such characters are present ++ # (speed optimization). + case $i in + (*' + '* | *'&'* | *'\'* | *'|'*) +- i=$(printf '%s\n' "$i" | +- sed ' +- $!N +- $s/[&\|]/\\&/g +- $s/\n/\\n/g +- ');; ++ i=$(printf '%s\n' "$i" | LC_ALL=C sed 's/[&\|]/\\&/g; $!s/$/\\/');; + esac +- sed_script="s|^|$i:|" ++ ++ # $i already ends with a colon so don't add it here. ++ sed_script="s|^|$i|" + + # Fail if grep or sed fails. + r=$( + exec 4>&1 +- (eval "$grep" 4>&-; echo $? >&4) 3>&- | sed "$sed_script" >&3 4>&- ++ (eval "$grep" 4>&-; echo $? >&4) 3>&- | ++ LC_ALL=C sed "$sed_script" >&3 4>&- + ) || r=2 + exit $r + fi >&3 5>&- +-- +2.35.1 + diff --git a/SPECS/xz.spec b/SPECS/xz.spec index 4f0751f..9b3d811 100644 --- a/SPECS/xz.spec +++ b/SPECS/xz.spec @@ -4,7 +4,7 @@ Summary: LZMA compression utilities Name: xz Version: 5.2.5 -Release: 7%{?dist} +Release: 8%{?dist} # Scripts xz{grep,diff,less,more} and symlinks (copied from gzip) are # GPLv2+, binaries are Public Domain (linked against LGPL getopt_long but its @@ -17,6 +17,7 @@ Source100: colorxzgrep.sh Source101: colorxzgrep.csh Patch1: xz-5.2.5-enable_CET.patch +Patch2: xz-5.2.5-cve-2022-1271.patch URL: https://tukaani.org/%{name}/ Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -160,6 +161,10 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %changelog +* Tue May 31 2022 Matej Mužila - 5.2.5-8 +- Fix arbitrary file write vulnerability + Resolves: CVE-2022-1271 + * Tue Aug 10 2021 Mohan Boddu - 5.2.5-7 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688