summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2021-11-09 10:04:05 +0800
committerAnuj Mittal <anuj.mittal@intel.com>2021-11-16 13:02:08 +0800
commit722c8fbe68a6236f9391eb0ded4c11efd6962de5 (patch)
treed55e058f94805f4b870fdf750ca9de8fdad4ed3b
parent20d7be2f3b481bc9a2f034f84eff1c48a4a13d92 (diff)
downloadopenembedded-core-722c8fbe68a6236f9391eb0ded4c11efd6962de5.tar.gz
squashfs-tools: follow-up fix for CVE-2021-41072
Squash a follow-up fix for CVE-2021-41072 from upstream: https://github.com/plougher/squashfs-tools/commit/19fcc93 Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 70709ff0741ed9fb9c111ef4b7aa2ee7432453f4) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-rw-r--r--meta/recipes-devtools/squashfs-tools/squashfs-tools/CVE-2021-41072.patch6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools/CVE-2021-41072.patch b/meta/recipes-devtools/squashfs-tools/squashfs-tools/CVE-2021-41072.patch
index 94d6da4b14..f807af60bc 100644
--- a/meta/recipes-devtools/squashfs-tools/squashfs-tools/CVE-2021-41072.patch
+++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools/CVE-2021-41072.patch
@@ -1,6 +1,10 @@
CVE: CVE-2021-41072
Upstream-Status: Backport [https://github.com/plougher/squashfs-tools/commit/e048580]
+Update on 20211109:
+Squash a follow-up fix for CVE-2021-41072 from upstream:
+https://github.com/plougher/squashfs-tools/commit/19fcc93
+
Signed-off-by: Kai Kang <kai.kang@windriver.com>
From e0485802ec72996c20026da320650d8362f555bd Mon Sep 17 00:00:00 2001
@@ -65,7 +69,7 @@ index 7262a2e..1b544ed 100755
unsquash-1234.o: unsquash-1234.c unsquashfs_error.h
-+unsquash-1234.o: unsquash-12.c
++unsquash-12.o: unsquash-12.c unsquashfs.h
+
unsquashfs_xattr.o: unsquashfs_xattr.c unsquashfs.h squashfs_fs.h xattr.h unsquashfs_error.h