3.18-stable patches

added patches:
	ext4-fix-fencepost-in-s_first_meta_bg-validation.patch

diff --git a/queue-3.18/ext4-fix-fencepost-in-s_first_meta_bg-validation.patch b/queue-3.18/ext4-fix-fencepost-in-s_first_meta_bg-validation.patch
new file mode 100644 (file)
index 0000000..212e93d
--- /dev/null
+++ b/queue-3.18/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 <tytso@mit.edu>
+Date: Wed, 15 Feb 2017 01:26:39 -0500
+Subject: ext4: fix fencepost in s_first_meta_bg validation
+
+From: Theodore Ts'o <tytso@mit.edu>
+
+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 <tytso@mit.edu>
+Cc: Eryu Guan <guaneryu@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/ext4/super.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/fs/ext4/super.c
++++ b/fs/ext4/super.c
+@@ -3932,7 +3932,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_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_META_BG)) {
+-              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-3.18/series b/queue-3.18/series
index c12495f08ca3c69a197e7a0a1554995ab9ee9eb0..5aa9779b7b2e403fede9e86fe2ab0e9806e5dc6d 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -30,3 +30,4 @@ fs-super.c-fix-race-between-freeze_super-and-thaw_super.patch
 ext4-fix-data-corruption-for-mmap-writes.patch
 ext4-don-t-clear-sgid-when-inheriting-acls.patch
 ext4-validate-s_first_meta_bg-at-mount-time.patch
+ext4-fix-fencepost-in-s_first_meta_bg-validation.patch