diff --git a/SOURCES/e2fsprogs-1.42.9-resize2fs-fix-resizing-large-file-systems-when-block.patch b/SOURCES/e2fsprogs-1.42.9-resize2fs-fix-resizing-large-file-systems-when-block.patch new file mode 100644 index 0000000..2704f62 --- /dev/null +++ b/SOURCES/e2fsprogs-1.42.9-resize2fs-fix-resizing-large-file-systems-when-block.patch @@ -0,0 +1,28 @@ +From c94aec3123293ed2288bd0bf5536d9bf16ecd07b Mon Sep 17 00:00:00 2001 +From: Theodore Ts'o +Date: Tue, 25 Oct 2016 13:18:14 -0400 +Subject: [PATCH] resize2fs: fix resizing large file systems when block size != + page size + +Reported by: Jerry Lee +Signed-off-by: Theodore Ts'o +--- + resize/main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/resize/main.c b/resize/main.c +index 3951b09..cf86a23 100644 +--- a/resize/main.c ++++ b/resize/main.c +@@ -406,7 +406,7 @@ int main (int argc, char ** argv) + new_size = max_size; + /* Round down to an even multiple of a pagesize */ + if (sys_page_size > fs->blocksize) +- new_size &= ~((sys_page_size / fs->blocksize)-1); ++ new_size &= ~((blk64_t)((sys_page_size / fs->blocksize)-1)); + } + if (!EXT2_HAS_INCOMPAT_FEATURE(fs->super, + EXT4_FEATURE_INCOMPAT_64BIT)) { +-- +2.21.0 + diff --git a/SPECS/e2fsprogs.spec b/SPECS/e2fsprogs.spec index b0dcbe2..ed62e2e 100644 --- a/SPECS/e2fsprogs.spec +++ b/SPECS/e2fsprogs.spec @@ -1,7 +1,7 @@ Summary: Utilities for managing ext2, ext3, and ext4 filesystems Name: e2fsprogs Version: 1.42.9 -Release: 16%{?dist} +Release: 17%{?dist} # License tags based on COPYING file distinctions for various components License: GPLv2 @@ -59,6 +59,7 @@ Patch46: e2fsprogs-1.42.9-14-e2fsck-if-any-problems-are-fixed-in-pass-0-check-th Patch47: e2fsprogs-1.42.9-14-Clarify-how-the-description-of-the-dir_nlink-feature.patch Patch48: e2fsprogs-1.42.9-14-e2fsck-set-dir_nlink-feature-if-large-dir-exists.patch Patch49: e2fsprogs-1.42.11-e2fsck-free-ctx-fs-not-fs-at-the-end-of-fsck.patch +Patch50: e2fsprogs-1.42.9-resize2fs-fix-resizing-large-file-systems-when-block.patch Url: http://e2fsprogs.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -257,6 +258,7 @@ It was originally inspired by the Multics SubSystem library. %patch47 -p1 %patch48 -p1 %patch49 -p1 +%patch50 -p1 %build %configure --enable-elf-shlibs --enable-nls --disable-uuidd --disable-fsck \ @@ -449,6 +451,9 @@ exit 0 %{_libdir}/pkgconfig/ss.pc %changelog +* Mon Nov 18 2019 Lukas Czerner 1.42.9-17 +- fix resizing large file systems when block size != page size (#1771515) + * Mon Jun 17 2019 Lukas Czerner 1.42.9-16 - Fix NULL pointer dereference when releasing memory (#1720903)