summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2021-11-09 10:04:05 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-11-10 19:27:28 +0000
commit2c0192479134de6ae89fb14cafb7930f2d91ea27 (patch)
treea0a3f6932f02d84c11026fea4ac213f31a464c14 /meta/recipes-devtools
parent40a8f79dda54354ec394a904e5d226e648bb5abf (diff)
downloadpoky-2c0192479134de6ae89fb14cafb7930f2d91ea27.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 (From OE-Core rev: 70709ff0741ed9fb9c111ef4b7aa2ee7432453f4) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-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 @@
1CVE: CVE-2021-41072 1CVE: CVE-2021-41072
2Upstream-Status: Backport [https://github.com/plougher/squashfs-tools/commit/e048580] 2Upstream-Status: Backport [https://github.com/plougher/squashfs-tools/commit/e048580]
3 3
4Update on 20211109:
5Squash a follow-up fix for CVE-2021-41072 from upstream:
6https://github.com/plougher/squashfs-tools/commit/19fcc93
7
4Signed-off-by: Kai Kang <kai.kang@windriver.com> 8Signed-off-by: Kai Kang <kai.kang@windriver.com>
5 9
6From e0485802ec72996c20026da320650d8362f555bd Mon Sep 17 00:00:00 2001 10From e0485802ec72996c20026da320650d8362f555bd Mon Sep 17 00:00:00 2001
@@ -65,7 +69,7 @@ index 7262a2e..1b544ed 100755
65 69
66 unsquash-1234.o: unsquash-1234.c unsquashfs_error.h 70 unsquash-1234.o: unsquash-1234.c unsquashfs_error.h
67 71
68+unsquash-1234.o: unsquash-12.c 72+unsquash-12.o: unsquash-12.c unsquashfs.h
69+ 73+
70 unsquashfs_xattr.o: unsquashfs_xattr.c unsquashfs.h squashfs_fs.h xattr.h unsquashfs_error.h 74 unsquashfs_xattr.o: unsquashfs_xattr.c unsquashfs.h squashfs_fs.h xattr.h unsquashfs_error.h
71 75