From cb5e4246bf81efb521041b2c1e5581e630ae9cdc Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 31 Jul 2018 23:28:25 +0800 Subject: [PATCH] Update to 4.18-rc7 --- debian/changelog | 2 +- ...egatives-and-false-positives-in-ext4.patch | 52 ------------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 debian/patches/bugfix/all/ext4-fix-false-negatives-and-false-positives-in-ext4.patch diff --git a/debian/changelog b/debian/changelog index da6d24a4f..94ea7755f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -linux (4.18~rc6-1~exp1) UNRELEASED; urgency=medium +linux (4.18~rc7-1~exp1) UNRELEASED; urgency=medium * New upstream release candidate diff --git a/debian/patches/bugfix/all/ext4-fix-false-negatives-and-false-positives-in-ext4.patch b/debian/patches/bugfix/all/ext4-fix-false-negatives-and-false-positives-in-ext4.patch deleted file mode 100644 index b6ae2e851..000000000 --- a/debian/patches/bugfix/all/ext4-fix-false-negatives-and-false-positives-in-ext4.patch +++ /dev/null @@ -1,52 +0,0 @@ -From: Theodore Ts'o -Date: Sun, 8 Jul 2018 19:35:02 -0400 -Subject: ext4: fix false negatives *and* false positives in - ext4_check_descriptors() -Origin: https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git/commit?id=44de022c4382541cebdd6de4465d1f4f465ff1dd -Bug-Debian: https://bugs.debian.org/903838 - -Ext4_check_descriptors() was getting called before s_gdb_count was -initialized. So for file systems w/o the meta_bg feature, allocation -bitmaps could overlap the block group descriptors and ext4 wouldn't -notice. - -For file systems with the meta_bg feature enabled, there was a -fencepost error which would cause the ext4_check_descriptors() to -incorrectly believe that the block allocation bitmap overlaps with the -block group descriptor blocks, and it would reject the mount. - -Fix both of these problems. - -Signed-off-by: Theodore Ts'o -Cc: stable@vger.kernel.org ---- - fs/ext4/super.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - ---- a/fs/ext4/super.c -+++ b/fs/ext4/super.c -@@ -2307,7 +2307,7 @@ static int ext4_check_descriptors(struct - struct ext4_sb_info *sbi = EXT4_SB(sb); - ext4_fsblk_t first_block = le32_to_cpu(sbi->s_es->s_first_data_block); - ext4_fsblk_t last_block; -- ext4_fsblk_t last_bg_block = sb_block + ext4_bg_num_gdb(sb, 0) + 1; -+ ext4_fsblk_t last_bg_block = sb_block + ext4_bg_num_gdb(sb, 0); - ext4_fsblk_t block_bitmap; - ext4_fsblk_t inode_bitmap; - ext4_fsblk_t inode_table; -@@ -4050,14 +4050,13 @@ static int ext4_fill_super(struct super_ - goto failed_mount2; - } - } -+ sbi->s_gdb_count = db_count; - if (!ext4_check_descriptors(sb, logical_sb_block, &first_not_zeroed)) { - ext4_msg(sb, KERN_ERR, "group descriptors corrupted!"); - ret = -EFSCORRUPTED; - goto failed_mount2; - } - -- sbi->s_gdb_count = db_count; -- - timer_setup(&sbi->s_err_report, print_daily_error_info, 0); - - /* Register extent status tree shrinker */ diff --git a/debian/patches/series b/debian/patches/series index 4006f08a4..c8ae3c390 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -133,7 +133,6 @@ features/all/lockdown/arm64-add-kernel-config-option-to-lock-down-when.patch # Security fixes debian/i386-686-pae-pci-set-pci-nobios-by-default.patch -bugfix/all/ext4-fix-false-negatives-and-false-positives-in-ext4.patch # Fix exported symbol versions bugfix/all/module-disable-matching-missing-version-crc.patch