forked from pool/e2fsprogs
Set link to e2fsprogs.23993 via maintenance_release request
Rev SUSE:SLE-12:Update/7 Md5 722f018cb657336e7b57ddbb1af7c5ad 2022-05-12 15:14:54 abergmann None
This commit is contained in:
OBS User abergmann
Git OBS Bridge
parent
904a514d0f
commit
8b0eb1b1c7
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 29 16:35:06 UTC 2022 - Jan Kara <jack@suse.cz>
|
||||
|
||||
- libext2fs-add-sanity-check-to-extent-manipulation.patch: libext2fs: add
|
||||
sanity check to extent manipulation (bsc#1198446 CVE-2022-1304)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 9 15:19:10 UTC 2020 - Jan Kara <jack@suse.cz>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package e2fsprogs
|
||||
#
|
||||
# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -46,7 +46,7 @@ Release: 0
|
||||
Summary: Utilities for the Second Extended File System
|
||||
License: GPL-2.0-only
|
||||
Group: System/Filesystems
|
||||
Url: http://e2fsprogs.sourceforge.net
|
||||
URL: http://e2fsprogs.sourceforge.net
|
||||
Requires: libcom_err2 >= %{version}
|
||||
Requires: libext2fs2 >= %{version}
|
||||
Source: http://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v%{version}/e2fsprogs-%{version}.tar.gz
|
||||
@ -72,6 +72,7 @@ Patch14: Revert-mke2fs-prevent-creation-of-unmountable-ext4-w.patch
|
||||
Patch15: libext2fs-place-metadata-blocks-in-the-last-flex_bg-.patch
|
||||
Patch16: e2fsck-abort-if-there-is-a-corrupted-directory-block.patch
|
||||
Patch17: e2fsck-don-t-try-to-rehash-a-deleted-directory.patch
|
||||
Patch18: libext2fs-add-sanity-check-to-extent-manipulation.patch
|
||||
|
||||
# Do not suppress make commands
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
@ -166,6 +167,7 @@ Development files for the com_err error message display library.
|
||||
%patch15 -p1
|
||||
%patch16 -p1
|
||||
%patch17 -p1
|
||||
%patch18 -p1
|
||||
cp %{SOURCE2} .
|
||||
|
||||
%build
|
||||
@ -226,6 +228,7 @@ popd
|
||||
for libName in $LIBNAMES;
|
||||
do ln -s %{_libdir}/$libName %{buildroot}/%{_lib};
|
||||
done
|
||||
|
||||
#EndUsrMerge
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
@ -249,7 +252,7 @@ done
|
||||
%defattr(-, root, root)
|
||||
%doc RELEASE-NOTES README
|
||||
%config /etc/mke2fs.conf
|
||||
#UsrMerge
|
||||
#UsrMerge
|
||||
/sbin/badblocks
|
||||
/sbin/debugfs
|
||||
/sbin/dumpe2fs
|
||||
@ -284,7 +287,7 @@ done
|
||||
%{_sbindir}/resize2fs
|
||||
%{_sbindir}/tune2fs
|
||||
%{_sbindir}/e2image
|
||||
%{_sbindir}/logsave
|
||||
%{_sbindir}/logsave
|
||||
%{_bindir}/chattr
|
||||
%{_bindir}/lsattr
|
||||
%{_sbindir}/mklost+found
|
||||
|
||||
56
libext2fs-add-sanity-check-to-extent-manipulation.patch
Normal file
56
libext2fs-add-sanity-check-to-extent-manipulation.patch
Normal file
@ -0,0 +1,56 @@
|
||||
From ab51d587bb9b229b1fade1afd02e1574c1ba5c76 Mon Sep 17 00:00:00 2001
|
||||
From: Lukas Czerner <lczerner@redhat.com>
|
||||
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 <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));
|
||||
--
|
||||
2.34.1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user