diff --git a/ext4-fix-false-negative-and-false-positives.patch b/ext4-fix-false-negative-and-false-positives.patch deleted file mode 100644 index 2beba4f..0000000 --- a/ext4-fix-false-negative-and-false-positives.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 44de022c4382541cebdd6de4465d1f4f465ff1dd Mon Sep 17 00:00:00 2001 -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() - -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(-) - -diff --git a/fs/ext4/super.c b/fs/ext4/super.c -index ba2396a7bd04..eff5c983e067 100644 ---- a/fs/ext4/super.c -+++ b/fs/ext4/super.c -@@ -2342,7 +2342,7 @@ static int ext4_check_descriptors(struct super_block *sb, - 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; -@@ -4085,14 +4085,13 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) - 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 */ --- -cgit 1.2-0.3.lf.el7 - diff --git a/kernel.spec b/kernel.spec index 62f8a1e..347391d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -54,7 +54,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 11 +%define stable_update 12 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -671,9 +671,6 @@ Patch523: 0001-xfs-More-robust-inode-extent-count-validation.patch # rhbz 1597333 # Patch526: xhci-Fix-perceived-dead-host-due-to-runtime-suspend-.patch -# rhbz 1602971 -Patch529: ext4-fix-false-negative-and-false-positives.patch - # CVE-2018-14678 rhbz 1608559 1608560 Patch530: xsa274-linux-4_17.patch @@ -1926,6 +1923,11 @@ fi # # %changelog +* Fri Aug 03 2018 Justin M. Forbes - 4.17.12-100 +- Linux v4.17.12 +- Fixes CVE-2018-14734 (rhbz 1611005 1611007) +- Fixes (rhbz 1609932) + * Mon Jul 30 2018 Justin M. Forbes - 4.17.11-100 - Linux v4.17.11 - Turn off kernel-headers for the split diff --git a/sources b/sources index 101c9f3..1103e96 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (linux-4.17.tar.xz) = 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db -SHA512 (patch-4.17.11.xz) = 6cab8f1aecceb0491dca25afa088f9601178c8dfec51551afd34e219600bba54f65f929d9a10948cdb5595e339e096473127b55b1142e6dbe9a818149bec307d +SHA512 (patch-4.17.12.xz) = 516270daaa65a0f40bf6202909fc1950a8c723b77d5a54089a72eb664c3708ece050c938230cdd3b1b3e281d73c1c5e909def5fe1e0c8ddecbf9fbd43713a3aa