From: Greg Kroah-Hartman Date: Fri, 24 Mar 2017 15:11:40 +0000 (+0100) Subject: 4.9-stable patches X-Git-Tag: v4.4.57~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a9e209b20cafdd82796097b88c46e07c73b8157;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: ext4-fix-fencepost-in-s_first_meta_bg-validation.patch --- diff --git a/queue-4.9/ext4-fix-fencepost-in-s_first_meta_bg-validation.patch b/queue-4.9/ext4-fix-fencepost-in-s_first_meta_bg-validation.patch new file mode 100644 index 00000000000..068c7871b5b --- /dev/null +++ b/queue-4.9/ext4-fix-fencepost-in-s_first_meta_bg-validation.patch @@ -0,0 +1,35 @@ +From 2ba3e6e8afc9b6188b471f27cf2b5e3cf34e7af2 Mon Sep 17 00:00:00 2001 +From: Theodore Ts'o +Date: Wed, 15 Feb 2017 01:26:39 -0500 +Subject: ext4: fix fencepost in s_first_meta_bg validation + +From: Theodore Ts'o + +commit 2ba3e6e8afc9b6188b471f27cf2b5e3cf34e7af2 upstream. + +It is OK for s_first_meta_bg to be equal to the number of block group +descriptor blocks. (It rarely happens, but it shouldn't cause any +problems.) + +https://bugzilla.kernel.org/show_bug.cgi?id=194567 + +Fixes: 3a4b77cd47bb837b8557595ec7425f281f2ca1fe +Signed-off-by: Theodore Ts'o +Cc: Jiri Slaby +Signed-off-by: Greg Kroah-Hartman + +--- + fs/ext4/super.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/fs/ext4/super.c ++++ b/fs/ext4/super.c +@@ -3830,7 +3830,7 @@ static int ext4_fill_super(struct super_ + db_count = (sbi->s_groups_count + EXT4_DESC_PER_BLOCK(sb) - 1) / + EXT4_DESC_PER_BLOCK(sb); + if (ext4_has_feature_meta_bg(sb)) { +- if (le32_to_cpu(es->s_first_meta_bg) >= db_count) { ++ if (le32_to_cpu(es->s_first_meta_bg) > db_count) { + ext4_msg(sb, KERN_WARNING, + "first meta block group too large: %u " + "(group descriptor block count %u)", diff --git a/queue-4.9/series b/queue-4.9/series index 0314b0e96f7..f085834a00c 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -21,3 +21,4 @@ gfs2-avoid-alignment-hole-in-struct-lm_lockname.patch percpu-acquire-pcpu_lock-when-updating-pcpu_nr_empty_pop_pages.patch cgroup-pids-remove-spurious-suspicious-rcu-usage-warning.patch drm-amdgpu-si-add-dpm-quirk-for-oland.patch +ext4-fix-fencepost-in-s_first_meta_bg-validation.patch