diff options
author | Kai Kang <kai.kang@windriver.com> | 2021-11-09 10:04:05 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-21 11:41:39 +0000 |
commit | f8ad42fc4909961878eb74eefaec8b86f62e6721 (patch) | |
tree | 6bef06eec5cea840d772478146dc53bd500463f8 | |
parent | 4b28378957642e0942088f1a0cdd595877912eaa (diff) | |
download | poky-f8ad42fc4909961878eb74eefaec8b86f62e6721.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: 722c8fbe68a6236f9391eb0ded4c11efd6962de5)
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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/squashfs-tools/squashfs-tools/CVE-2021-41072.patch | 6 |
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 @@ | |||
1 | CVE: CVE-2021-41072 | 1 | CVE: CVE-2021-41072 |
2 | Upstream-Status: Backport [https://github.com/plougher/squashfs-tools/commit/e048580] | 2 | Upstream-Status: Backport [https://github.com/plougher/squashfs-tools/commit/e048580] |
3 | 3 | ||
4 | Update on 20211109: | ||
5 | Squash a follow-up fix for CVE-2021-41072 from upstream: | ||
6 | https://github.com/plougher/squashfs-tools/commit/19fcc93 | ||
7 | |||
4 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | 8 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
5 | 9 | ||
6 | From e0485802ec72996c20026da320650d8362f555bd Mon Sep 17 00:00:00 2001 | 10 | From 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 | ||