Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755218Ab0KSPl1 (ORCPT ); Fri, 19 Nov 2010 10:41:27 -0500 Received: from THUNK.ORG ([69.25.196.29]:56228 "EHLO thunker.thunk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755198Ab0KSPlX (ORCPT ); Fri, 19 Nov 2010 10:41:23 -0500 Date: Fri, 19 Nov 2010 09:59:37 -0500 From: "Ted Ts'o" To: "Darrick J. Wong" Cc: Lukas Czerner , Eric Sandeen , "Patrick J. LoPresti" , linux-kernel , linux-ext4 , Mingming Cao Subject: Re: [PATCH v2] ext4: ext4_fill_super shouldn't return 0 on corruption Message-ID: <20101119145936.GD10039@thunk.org> Mail-Followup-To: Ted Ts'o , "Darrick J. Wong" , Lukas Czerner , Eric Sandeen , "Patrick J. LoPresti" , linux-kernel , linux-ext4 , Mingming Cao References: <20101115214831.GA18195@tux1.beaverton.ibm.com> <4CE1AC38.9040201@redhat.com> <20101115230346.GB18195@tux1.beaverton.ibm.com> <20101116225538.GC18195@tux1.beaverton.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20101116225538.GC18195@tux1.beaverton.ibm.com> User-Agent: Mutt/1.5.20 (2009-06-14) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: tytso@thunk.org X-SA-Exim-Scanned: No (on thunker.thunk.org); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2120 Lines: 58 On Tue, Nov 16, 2010 at 02:55:38PM -0800, Darrick J. Wong wrote: > > the untested diff below seems like a more general solution to me, > > since it allows to return the actual error from > > generic_check_addressable(). > > It seems to work ok for me, so: > > Acked-by: Darrick J. Wong > > I will make the same change to ext3. OK, this is what I've added to the ext4 patch queue --- ext4: ext4_fill_super shouldn't return 0 on corruption From: "Darrick J. Wong" At the start of ext4_fill_super, ret is set to -EINVAL, and any failure path out of that function returns 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, leading to an oops. A simple fix is to avoid using ret for the generic_check_addressable check, which was last changed in commit 30ca22c70e3. Signed-off-by: Darrick J. Wong Signed-off-by: "Theodore Ts'o" --- diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 61182fe..3d89b72 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -3268,13 +3268,14 @@ 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, + err = generic_check_addressable(sb->s_blocksize_bits, ext4_blocks_count(es)); - if (ret) { + if (err) { ext4_msg(sb, KERN_ERR, "filesystem" " too large to mount safely on this system"); if (sizeof(sector_t) < 8) ext4_msg(sb, KERN_WARNING, "CONFIG_LBDAF not enabled"); + ret = err; goto failed_mount; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/