[PATCH] ext4: avoid oversized shift in ext4_fill_flex_info()
[Posted February 18, 2013 by corbet]
| From: |
| Xi Wang <xi.wang-AT-gmail.com> |
| To: |
| Theodore Ts'o <tytso-AT-mit.edu>,
Andreas Dilger <adilger.kernel-AT-dilger.ca> |
| Subject: |
| [PATCH] ext4: avoid oversized shift in ext4_fill_flex_info() |
| Date: |
| Mon, 26 Dec 2011 01:36:44 -0500 |
| Message-ID: |
| <1324881404-3791-1-git-send-email-xi.wang@gmail.com> |
| Cc: |
| linux-ext4-AT-vger.kernel.org, Xi Wang <xi.wang-AT-gmail.com> |
| Archive-link: |
| Article, Thread
|
Commit 503358ae fixed a division by zero, but groups_per_flex still
overflows due to an oversized shift, given a large s_log_groups_per_flex
like 36. (1 << 36) is undefined in C; the result may vary depending
on the architecture, e.g., 16 on x86, thus bypassing the sanity check
(groups_per_flex < 2).
Signed-off-by: Xi Wang <xi.wang@gmail.com>
---
fs/ext4/super.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 3e1329e..6deaf41 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -2010,14 +2010,15 @@ static int ext4_fill_flex_info(struct super_block *sb)
size_t size;
int i;
- sbi->s_log_groups_per_flex = sbi->s_es->s_log_groups_per_flex;
- groups_per_flex = 1 << sbi->s_log_groups_per_flex;
(
Log in to post comments)