From e742aede043e643a34237d27b48f1709d7662fc2 Mon Sep 17 00:00:00 2001 From: Zhiqiang Liu Date: Sat, 28 May 2022 10:02:50 +0800 Subject: [PATCH] e2fsprogs: fix CVE-2022-1304 backport "libext2fs:add santiy check to extent manipulation" patch to fix CVE-2022-1304. Fix issue: https://gitee.com/src-openeuler/e2fsprogs/issues/I59OWQ Signed-off-by: Zhiqiang Liu --- ...-sanity-check-to-extent-manipulation.patch | 55 +++++++++++++++++++ e2fsprogs.spec | 6 +- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 0015-libext2fs-add-sanity-check-to-extent-manipulation.patch diff --git a/0015-libext2fs-add-sanity-check-to-extent-manipulation.patch b/0015-libext2fs-add-sanity-check-to-extent-manipulation.patch new file mode 100644 index 0000000..cbf00b6 --- /dev/null +++ b/0015-libext2fs-add-sanity-check-to-extent-manipulation.patch @@ -0,0 +1,55 @@ +From ab51d587bb9b229b1fade1afd02e1574c1ba5c76 Mon Sep 17 00:00:00 2001 +From: Lukas Czerner +Date: Thu, 21 Apr 2022 19:31:48 +0200 +Subject: [PATCH] libext2fs: add sanity check to extent manipulation + +It is possible to have a corrupted extent tree in such a way that a leaf +node contains zero extents in it. Currently if that happens and we try +to traverse the tree we can end up accessing wrong data, or possibly +even uninitialized memory. Make sure we don't do that. + +Additionally make sure that we have a sane number of bytes passed to +memmove() in ext2fs_extent_delete(). + +Note that e2fsck is currently unable to spot and fix such corruption in +pass1. + +Signed-off-by: Lukas Czerner +Reported-by: Nils Bars +Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2068113 +Addresses: CVE-2022-1304 +Addresses-Debian-Bug: #1010263 +Signed-off-by: Theodore Ts'o +--- + lib/ext2fs/extent.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/lib/ext2fs/extent.c b/lib/ext2fs/extent.c +index b324c7b..1a206a1 100644 +--- a/lib/ext2fs/extent.c ++++ b/lib/ext2fs/extent.c +@@ -495,6 +495,10 @@ retry: + ext2fs_le16_to_cpu(eh->eh_entries); + newpath->max_entries = ext2fs_le16_to_cpu(eh->eh_max); + ++ /* Make sure there is at least one extent present */ ++ if (newpath->left <= 0) ++ return EXT2_ET_EXTENT_NO_DOWN; ++ + if (path->left > 0) { + ix++; + newpath->end_blk = ext2fs_le32_to_cpu(ix->ei_block); +@@ -1630,6 +1634,10 @@ errcode_t ext2fs_extent_delete(ext2_extent_handle_t handle, int flags) + + cp = path->curr; + ++ /* Sanity check before memmove() */ ++ if (path->left < 0) ++ return EXT2_ET_EXTENT_LEAF_BAD; ++ + if (path->left) { + memmove(cp, cp + sizeof(struct ext3_extent_idx), + path->left * sizeof(struct ext3_extent_idx)); +-- +1.8.3.1 + diff --git a/e2fsprogs.spec b/e2fsprogs.spec index e39b150..1a290db 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -1,6 +1,6 @@ Name: e2fsprogs Version: 1.46.4 -Release: 9 +Release: 10 Summary: Second extended file system management tools License: GPLv2+ and LGPLv2 and MIT URL: http://e2fsprogs.sourceforge.net/ @@ -20,6 +20,7 @@ Patch11: 0011-libext2fs-don-t-old-the-CACHE_MTX-while-doing-I-O.patch Patch12: 0012-tests-skip-m_rootdir_acl-if-selinux-is-not-disabled.patch Patch13: 0013-e2fsck-do-not-clean-up-file-acl-if-the-inode-is-trun.patch Patch14: 0014-e2fsck-handle-level-is-overflow-in-ext2fs_extent_get.patch +Patch15: 0015-libext2fs-add-sanity-check-to-extent-manipulation.patch BuildRequires: gcc pkgconfig texinfo @@ -142,6 +143,9 @@ exit 0 %{_mandir}/man8/* %changelog +* Sat May 28 2022 Zhiqiang Liu - 1.46.4-10 +- fix CVE-2022-1304 + * Fri May 20 2022 zhanchengbin - 1.46.4-9 - e2fsck: handle->level is overflow in ext2fs_extent_get. -- Gitee