From: "Darrick J. Wong" <djwong@us.ibm.com>
To: "Theodore Ts'o" <tytso@mit.edu>,
"Patrick J. LoPresti" <lopresti@gmail.com>
Cc: linux-kernel <linux-kernel@vger.kernel.org>,
linux-ext4 <linux-ext4@vger.kernel.org>,
Mingming Cao <mcao@us.ibm.com>
Subject: [PATCH] ext4: ext4_fill_super shouldn't return 0 on corruption
Date: Mon, 15 Nov 2010 13:48:31 -0800 [thread overview]
Message-ID: <20101115214831.GA18195@tux1.beaverton.ibm.com> (raw)
At the start of ext4_fill_super, ret is set to -EINVAL, and any failure path
out of that function returns this ret. However, the generic_check_addressable
clause sets ret = 0 if it passes, which means that a subsequent failure (e.g.
a group checksum error) returns 0 even though the mount should fail. This
causes vfs_kern_mount in turn to think that the mount succeeded (because
PTR_ERR(0) is false), leading to an oops.
A simple fix is to avoid using ret for the generic_check_addressable check,
which was last changed in commit 30ca22c70e3ef0a96ff84de69cd7e8561b416cb2.
Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>
---
fs/ext4/super.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 40131b7..a44bc59 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -3257,9 +3257,8 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
* Test whether we have more sectors than will fit in sector_t,
* and whether the max offset is addressable by the page cache.
*/
- ret = generic_check_addressable(sb->s_blocksize_bits,
- ext4_blocks_count(es));
- if (ret) {
+ if (generic_check_addressable(sb->s_blocksize_bits,
+ ext4_blocks_count(es))) {
ext4_msg(sb, KERN_ERR, "filesystem"
" too large to mount safely on this system");
if (sizeof(sector_t) < 8)
next reply other threads:[~2010-11-15 21:48 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-15 21:48 Darrick J. Wong [this message]
2010-11-15 21:55 ` [PATCH] ext4: ext4_fill_super shouldn't return 0 on corruption Eric Sandeen
2010-11-15 23:03 ` [PATCH v2] " Darrick J. Wong
2010-11-16 12:56 ` Lukas Czerner
2010-11-16 17:43 ` Eric Sandeen
2010-11-16 22:55 ` Darrick J. Wong
2010-11-18 8:42 ` Lukas Czerner
2010-11-19 14:59 ` Ted Ts'o
2010-11-16 22:57 ` [PATCH] ext3: Return error code from generic_check_addressable Darrick J. Wong
2010-11-18 8:52 ` Lukas Czerner
2010-11-22 18:27 ` Jan Kara
-- strict thread matches above, loose matches on Subject: below --
2010-11-18 8:45 [PATCH] ext4: ext4_fill_super shouldn't return 0 on corruption Lukas Czerner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101115214831.GA18195@tux1.beaverton.ibm.com \
--to=djwong@us.ibm.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lopresti@gmail.com \
--cc=mcao@us.ibm.com \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).