[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1356771328-18196-2-git-send-email-tytso@mit.edu>
Date: Sat, 29 Dec 2012 03:55:23 -0500
From: Theodore Ts'o <tytso@....edu>
To: Ext4 Developers List <linux-ext4@...r.kernel.org>
Cc: George Spelvin <linux@...izon.com>, Theodore Ts'o <tytso@....edu>
Subject: [PATCH 1/6] mke2fs: fix crash when parsing "-E resize=NNN" with "-O 64bit"
If the 64-bit file system feature is enabled, then mke2fs would crash
due to a divide-by-zero error caused by s_desc_size not being
initialized yet.
Reported-by: George Spelvin <linux@...izon.com>
Signed-off-by: "Theodore Ts'o" <tytso@....edu>
---
misc/mke2fs.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index 7ec8cc2..0f9a299 100644
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -1873,6 +1873,14 @@ profile_error:
blocksize = EXT2_BLOCK_SIZE(&fs_param);
+ /*
+ * Initialize s_desc_size so that the parse_extended_opts()
+ * can correctly handle "-E resize=NNN" if the 64-bit option
+ * is set.
+ */
+ if (fs_param.s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT)
+ fs_param.s_desc_size = EXT2_MIN_DESC_SIZE_64BIT;
+
/* This check should happen beyond the last assignment to blocksize */
if (blocksize > sys_page_size) {
if (!force) {
--
1.7.12.rc0.22.gcdd159b
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists