From 80f1a7a52355fc9f39d67d3b8ac0db9e880557a5 Mon Sep 17 00:00:00 2001 From: OBS User darix Date: Tue, 17 May 2022 15:44:41 +0000 Subject: [PATCH] Set link to e2fsprogs.23987 via maintenance_release request Rev SUSE:SLE-15-SP4:Update/1 Md5 23c42c00758f5f8f7f389933825fe19b 2022-05-17 15:44:41 darix None --- e2fsprogs.changes | 6 ++ e2fsprogs.spec | 2 + ...-sanity-check-to-extent-manipulation.patch | 56 +++++++++++++++++++ 3 files changed, 64 insertions(+) create mode 100644 libext2fs-add-sanity-check-to-extent-manipulation.patch diff --git a/e2fsprogs.changes b/e2fsprogs.changes index bc873ac..628b881 100644 --- a/e2fsprogs.changes +++ b/e2fsprogs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 29 15:49:06 UTC 2022 - Jan Kara + +- libext2fs-add-sanity-check-to-extent-manipulation.patch: libext2fs: add + sanity check to extent manipulation (bsc#1198446 CVE-2022-1304) + ------------------------------------------------------------------- Mon Oct 4 16:57:08 UTC 2021 - Jan Kara diff --git a/e2fsprogs.spec b/e2fsprogs.spec index c400950..3af44f1 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -101,6 +101,7 @@ Patch14: tune2fs-Fix-conversion-of-quota-files.patch Patch15: e2fsck-Do-not-trash-user-limits-when-processing-orph.patch Patch16: debugfs-Fix-headers-for-quota-commands.patch Patch17: quota-Drop-dead-code.patch +Patch18: libext2fs-add-sanity-check-to-extent-manipulation.patch # Do not suppress make commands BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -277,6 +278,7 @@ cp %{SOURCE2} . %patch15 -p1 %patch16 -p1 %patch17 -p1 +%patch18 -p1 %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects diff --git a/libext2fs-add-sanity-check-to-extent-manipulation.patch b/libext2fs-add-sanity-check-to-extent-manipulation.patch new file mode 100644 index 0000000..39e6da5 --- /dev/null +++ b/libext2fs-add-sanity-check-to-extent-manipulation.patch @@ -0,0 +1,56 @@ +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 +References: bsc#1198446 CVE-2022-1304 + +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 b324c7b0f8c8..1a206a16c13f 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)); +-- +2.34.1 +