From patchwork Thu Aug 29 00:44:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Darrick Wong X-Patchwork-Id: 270656 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 5C9DA2C00B1 for ; Thu, 29 Aug 2013 10:44:12 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754248Ab3H2AoL (ORCPT ); Wed, 28 Aug 2013 20:44:11 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:26974 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753060Ab3H2AoK (ORCPT ); Wed, 28 Aug 2013 20:44:10 -0400 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by userp1040.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id r7T0i7gr031718 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 29 Aug 2013 00:44:08 GMT Received: from aserz7022.oracle.com (aserz7022.oracle.com [141.146.126.231]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r7T0i7Wj019383 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 29 Aug 2013 00:44:07 GMT Received: from abhmt101.oracle.com (abhmt101.oracle.com [141.146.116.53]) by aserz7022.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r7T0i6km021349; Thu, 29 Aug 2013 00:44:06 GMT Received: from localhost (/10.145.179.107) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 28 Aug 2013 17:44:06 -0700 Subject: [PATCH 3/6] e2fsck: Fix incorrect bbitmap checksum failure caused by integer overflow To: tytso@mit.edu, darrick.wong@oracle.com From: "Darrick J. Wong" Cc: linux-ext4@vger.kernel.org Date: Wed, 28 Aug 2013 17:44:04 -0700 Message-ID: <20130829004404.3190.22438.stgit@blackbox.djwong.org> In-Reply-To: <20130829004344.3190.28053.stgit@blackbox.djwong.org> References: <20130829004344.3190.28053.stgit@blackbox.djwong.org> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org On a filesystem with more than 2^32 blocks, the block group checksum test will fail because "i" (the group number) is a 32-bit quantity that is used to calculate the group's block bitmap block number. Unfortunately, "i" is not automatically promoted to 64-bit for this calculation and overflows. When this happens, e2fsck will incorrectly report bitmap checksum errors. Signed-off-by: Darrick J. Wong --- e2fsck/pass5.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 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/e2fsck/pass5.c b/e2fsck/pass5.c index 51e4683..0fe7045 100644 --- a/e2fsck/pass5.c +++ b/e2fsck/pass5.c @@ -168,7 +168,7 @@ static void check_block_bitmap_checksum(e2fsck_t ctx) blk_itr = EXT2FS_B2C(ctx->fs, ctx->fs->super->s_first_data_block) + - (i * (nbytes << 3)); + ((blk64_t)i * (nbytes << 3)); retval = ext2fs_get_block_bitmap_range2(ctx->fs->block_map, blk_itr, nbytes << 3, buf);