mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-12-12 01:14:22 -05:00
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From 6cc435bb47841104995c8668de8f5839d0040357 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
|
|
|
|
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>
|
|
[bwh: Backported to 3.16: adjust context]
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
---
|
|
fs/ext4/super.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
|
|
index a0f6526..af0267f 100644
|
|
--- a/fs/ext4/super.c
|
|
+++ b/fs/ext4/super.c
|
|
@@ -3916,7 +3916,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
|
|
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)",
|
|
--
|
|
cgit v1.1
|
|
|