From patchwork Mon Nov 15 21:48:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 71307 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 97368B712B for ; Tue, 16 Nov 2010 08:48:44 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758505Ab0KOVsm (ORCPT ); Mon, 15 Nov 2010 16:48:42 -0500 Received: from e6.ny.us.ibm.com ([32.97.182.146]:37955 "EHLO e6.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754847Ab0KOVsm (ORCPT ); Mon, 15 Nov 2010 16:48:42 -0500 Received: from d01relay01.pok.ibm.com (d01relay01.pok.ibm.com [9.56.227.233]) by e6.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id oAFLnVNe026328; Mon, 15 Nov 2010 16:49:31 -0500 Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay01.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id oAFLmV4N378622; Mon, 15 Nov 2010 16:48:31 -0500 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id oAFLmUAp015114; Mon, 15 Nov 2010 16:48:31 -0500 Received: from tux1.beaverton.ibm.com (elm3b50.beaverton.ibm.com [9.47.67.50]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id oAFLmURT015081; Mon, 15 Nov 2010 16:48:30 -0500 Received: by tux1.beaverton.ibm.com (Postfix, from userid 501) id BB1DD13E7A4; Mon, 15 Nov 2010 13:48:29 -0800 (PST) Date: Mon, 15 Nov 2010 13:48:31 -0800 From: "Darrick J. Wong" To: "Theodore Ts'o" , "Patrick J. LoPresti" Cc: linux-kernel , linux-ext4 , Mingming Cao Subject: [PATCH] ext4: ext4_fill_super shouldn't return 0 on corruption Message-ID: <20101115214831.GA18195@tux1.beaverton.ibm.com> Reply-To: djwong@us.ibm.com MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.17+20080114 (2008-01-14) Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org 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 --- fs/ext4/super.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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)