diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2022-10-18 20:34:53 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2022-10-18 20:35:34 +0300 |
commit | 46fc02f3932e37eb07ed7cd23ac96d464c6db55c (patch) | |
tree | b60616a81b0bbc1012f678b783df7c2e07f72161 /poky/meta/recipes-extended/xz/xz/CVE-2022-1271.patch | |
parent | a515de07dfa9eda7a303af296666e2572e581df7 (diff) | |
download | openbmc-honister.tar.xz |
subtree updateshonister
meta-openembedded: 9a0caf5b09..0e6c34f82c:
Martin Jansa (1):
ostree: prevent ostree-native depending on target virtual/kernel to provide kernel-module-overlay
Nicolas Dechesne (1):
imlib2: update SRC_URI
poky: eff78b3802..fd00d74f47:
Alexandre Belloni (1):
pseudo: Fix handling of absolute links
Anuj Mittal (2):
poky.conf: bump version for 3.4.4 release
documentation: update for 3.4.4 release
Bruce Ashfield (10):
linux-yocto/5.10: update to v5.10.109
lttng-modules: update to 2.13.1
lttng-modules: support kernel 5.18+
linux-yocto/5.10: features/security: Move x86_64 configs to separate file
linux-yocto/5.10: update to v5.10.110
linux-yocto/5.10: base: enable kernel crypto userspace API
linux-yocto/5.10: update to v5.10.112
linux-yocto: enable powerpc debug fragment
linux-yocto/5.10: update to v5.10.113
yocto-bsps: update to v5.10.113
Chen Qi (1):
cases/buildepoxy.py: fix typo
Davide Gardenal (1):
rootfs-postcommands: fix symlinks where link and output path are equal
Dmitry Baryshkov (2):
linux-firmware: correct license for ar3k firmware
linux-firmware: upgrade 20220411 -> 20220509
Felix Moessbauer (1):
wic/plugins/rootfs: Fix permissions when splitting rootfs folders across partitions
Joe Slater (1):
unzip: fix CVE-2021-4217
Khem Raj (2):
busybox: Use base_bindir instead of hardcoding /bin path
linux-yocto: Enable powerpc-debug fragment for ppc64 LE
Konrad Weihmann (1):
gmp: add missing COPYINGv3
Martin Jansa (1):
license_image.bbclass: close package.manifest file
Max Krummenacher (2):
perf: sort-pmuevents: don't drop elements
perf: sort-pmuevents: allow for additional type qualifiers and storage class
Michael Opdenacker (1):
adding missing space in appends
Ovidiu Panait (1):
openssl: upgrade 1.1.1l -> 1.1.1n
Paul Gortmaker (1):
install/devshell: Introduce git intercept script due to fakeroot issues
Peter Kjellerstedt (1):
u-boot: Inherit pkgconfig
Portia (1):
volatile-binds: Change DefaultDependencies from false to no
Rahul Kumar (1):
neard: Switch SRC_URI to git repo
Ralph Siemsen (1):
xz: fix CVE-2022-1271
Ranjitsinh Rathod (1):
openssl: Minor security upgrade 1.1.1n to 1.1.1o
Richard Purdie (14):
scripts/runqemu: Fix memory limits for qemux86-64
vim: Upgrade 8.2.4524 -> 8.2.4681
uninative: Upgrade to 3.6 with gcc 12 support
tiff: Add marker for CVE-2022-1056 being fixed
externalsrc/devtool: Fix to work with fixed export funcition flags handling
libxshmfence: Correct LICENSE to HPND
alsa-tools: Ensure we install correctly
shadow-native: Simplify and fix syslog disable patch
build-appliance-image: Update to honister head revision
base: Avoid circular references to our own scripts
base: Drop git intercept
scripts: Make git intercept global
scripts/git: Ensure we don't have circular references
vim: Upgrade 8.2.4681 -> 8.2.4912
Ross Burton (4):
bitbake: knotty: display active tasks when printing keepAlive() message
bitbake: knotty: reduce keep-alive timeout from 5000s (83 minutes) to 10 minutes
bitbake.conf: mark all directories as safe for git to read
oeqa/selftest: add test for git working correctly inside pseudo
wangmy (3):
linux-firmware: upgrade 20220310 -> 20220411
lttng-modules: upgrade 2.13.1 -> 2.13.2
lttng-modules: upgrade 2.13.2 -> 2.13.3
zhengruoqin (1):
wireless-regdb: upgrade 2022.02.18 -> 2022.04.08
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I0298ba1d7a4f4f77e0ebe24f18b3f8bdc326097b
Diffstat (limited to 'poky/meta/recipes-extended/xz/xz/CVE-2022-1271.patch')
-rw-r--r-- | poky/meta/recipes-extended/xz/xz/CVE-2022-1271.patch | 96 |
1 files changed, 96 insertions, 0 deletions
diff --git a/poky/meta/recipes-extended/xz/xz/CVE-2022-1271.patch b/poky/meta/recipes-extended/xz/xz/CVE-2022-1271.patch new file mode 100644 index 0000000000..e43e73cf12 --- /dev/null +++ b/poky/meta/recipes-extended/xz/xz/CVE-2022-1271.patch @@ -0,0 +1,96 @@ +From dc932a1e9c0d9f1db71be11a9b82496e3a72f112 Mon Sep 17 00:00:00 2001 +From: Lasse Collin <lasse.collin@tukaani.org> +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 \<newline> 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. + +Upstream-Status: Backport [https://tukaani.org/xz/xzgrep-ZDI-CAN-16587.patch] +CVE: CVE-2022-1271 + +Signed-off-by: Ralph Siemsen <ralph.siemsen@linaro.org> +--- + 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 9db5c3a..f64dddb 100644 +--- a/src/scripts/xzgrep.in ++++ b/src/scripts/xzgrep.in +@@ -179,22 +179,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>&- |