[ptxdist] [PATCH] e2fsprogs: Fix CVE-2022-1304.

[ptxdist] [PATCH] e2fsprogs: Fix CVE-2022-1304.

[Christian Melki]

Out-of-bounds read/write vulnerability.
Issue leads to segmentation fault and possibly arbitrary code
execution via a specially crafted filesystem.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 ...-sanity-check-to-extent-manipulation.patch | 51 +++++++++++++++++++
 patches/e2fsprogs-1.46.5/series               |  4 ++
 2 files changed, 55 insertions(+)
 create mode 100644 patches/e2fsprogs-1.46.5/0001-libext2fs-add-sanity-check-to-extent-manipulation.patch
 create mode 100644 patches/e2fsprogs-1.46.5/series

diff --git a/patches/e2fsprogs-1.46.5/0001-libext2fs-add-sanity-check-to-extent-manipulation.patch b/patches/e2fsprogs-1.46.5/0001-libext2fs-add-sanity-check-to-extent-manipulation.patch
new file mode 100644
index 000000000..979dbb236
--- /dev/null
+++ b/patches/e2fsprogs-1.46.5/0001-libext2fs-add-sanity-check-to-extent-manipulation.patch
@@ -0,0 +1,51 @@
+From: Lukas Czerner <lczerner@redhat.com>
+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 <lczerner@redhat.com>
+Reported-by: Nils Bars <nils_bars@t-online.de>
+Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2068113
+Addresses: CVE-2022-1304
+Addresses-Debian-Bug: #1010263
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+---
+ 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));
diff --git a/patches/e2fsprogs-1.46.5/series b/patches/e2fsprogs-1.46.5/series
new file mode 100644
index 000000000..d4319d8ac
--- /dev/null
+++ b/patches/e2fsprogs-1.46.5/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-libext2fs-add-sanity-check-to-extent-manipulation.patch
+# 77d6a61d2930f9f66b3b54043619c609  - git-ptx-patches magic
-- 
2.34.1

Re: [ptxdist] [APPLIED] e2fsprogs: Fix CVE-2022-1304.

[Michael Olbrich]

Thanks, applied as a3e07da1670101669dbe876fd8ef094decc9803c.

Michael

[sent from post-receive hook]

On Mon, 20 Jun 2022 08:19:42 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> Out-of-bounds read/write vulnerability.
> Issue leads to segmentation fault and possibly arbitrary code
> execution via a specially crafted filesystem.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20220616132741.1053903-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/e2fsprogs-1.46.5/0001-libext2fs-add-sanity-check-to-extent-manipulation.patch b/patches/e2fsprogs-1.46.5/0001-libext2fs-add-sanity-check-to-extent-manipulation.patch
> new file mode 100644
> index 000000000000..979dbb23608c
> --- /dev/null
> +++ b/patches/e2fsprogs-1.46.5/0001-libext2fs-add-sanity-check-to-extent-manipulation.patch
> @@ -0,0 +1,51 @@
> +From: Lukas Czerner <lczerner@redhat.com>
> +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 <lczerner@redhat.com>
> +Reported-by: Nils Bars <nils_bars@t-online.de>
> +Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2068113
> +Addresses: CVE-2022-1304
> +Addresses-Debian-Bug: #1010263
> +Signed-off-by: Theodore Ts'o <tytso@mit.edu>
> +---
> + 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));
> diff --git a/patches/e2fsprogs-1.46.5/series b/patches/e2fsprogs-1.46.5/series
> new file mode 100644
> index 000000000000..d4319d8ac6eb
> --- /dev/null
> +++ b/patches/e2fsprogs-1.46.5/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-libext2fs-add-sanity-check-to-extent-manipulation.patch
> +# 77d6a61d2930f9f66b3b54043619c609  - git-ptx-patches magic