|
 |
1f0cb0 |
From 2ab3543e3b3330317769adcbe4bdb2f3c0b855e9 Mon Sep 17 00:00:00 2001
|
|
|
1f0cb0 |
From: "Darrick J. Wong" <darrick.wong@oracle.com>
|
|
|
1f0cb0 |
Date: Thu, 24 Jul 2014 22:19:27 -0400
|
|
|
1f0cb0 |
Subject: [PATCH 14/16] e2fsck: fix off-by-one bounds check on group number
|
|
|
1f0cb0 |
|
|
|
1f0cb0 |
commit b4f724c8a90987d4785fd1accfe69c125567be39
|
|
|
1f0cb0 |
|
|
|
1f0cb0 |
Since fs->group_desc_count is the number of block groups, the number
|
|
|
1f0cb0 |
of the last group is always one less than this count. Fix the bounds
|
|
|
1f0cb0 |
check to reflect that.
|
|
|
1f0cb0 |
|
|
|
1f0cb0 |
This flaw shouldn't have any user-visible side effects, since the
|
|
|
1f0cb0 |
block bitmap test based on last_grp later on can handle overbig block
|
|
|
1f0cb0 |
numbers.
|
|
|
1f0cb0 |
|
|
|
1f0cb0 |
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
|
|
|
1f0cb0 |
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
|
|
|
1f0cb0 |
---
|
|
|
1f0cb0 |
e2fsck/pass1.c | 4 ++--
|
|
|
1f0cb0 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
1f0cb0 |
|
|
|
1f0cb0 |
diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
|
|
|
1f0cb0 |
index 71b3000a..b58a0ca7 100644
|
|
|
1f0cb0 |
--- a/e2fsck/pass1.c
|
|
|
1f0cb0 |
+++ b/e2fsck/pass1.c
|
|
|
1f0cb0 |
@@ -2599,8 +2599,8 @@ static void new_table_block(e2fsck_t ctx, blk64_t first_block, dgrp_t group,
|
|
|
1f0cb0 |
first_block = ext2fs_group_first_block2(fs,
|
|
|
1f0cb0 |
flexbg_size * flexbg);
|
|
|
1f0cb0 |
last_grp = group | (flexbg_size - 1);
|
|
|
1f0cb0 |
- if (last_grp > fs->group_desc_count)
|
|
|
1f0cb0 |
- last_grp = fs->group_desc_count;
|
|
|
1f0cb0 |
+ if (last_grp >= fs->group_desc_count)
|
|
|
1f0cb0 |
+ last_grp = fs->group_desc_count - 1;
|
|
|
1f0cb0 |
last_block = ext2fs_group_last_block2(fs, last_grp);
|
|
|
1f0cb0 |
} else
|
|
|
1f0cb0 |
last_block = ext2fs_group_last_block2(fs, group);
|
|
|
1f0cb0 |
--
|
|
|
1f0cb0 |
2.20.1
|
|
|
1f0cb0 |
|