From patchwork Mon May 2 18:18:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Bo X-Patchwork-Id: 8994231 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E53D09F39D for ; Mon, 2 May 2016 18:19:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C6A0F20225 for ; Mon, 2 May 2016 18:19:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 66B1520222 for ; Mon, 2 May 2016 18:19:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754823AbcEBSS5 (ORCPT ); Mon, 2 May 2016 14:18:57 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:42359 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754511AbcEBSS4 (ORCPT ); Mon, 2 May 2016 14:18:56 -0400 Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u42IIMWK011698 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 2 May 2016 18:18:23 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserv0022.oracle.com (8.13.8/8.13.8) with ESMTP id u42IIMZV000794 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 2 May 2016 18:18:22 GMT Received: from abhmp0008.oracle.com (abhmp0008.oracle.com [141.146.116.14]) by aserv0121.oracle.com (8.13.8/8.13.8) with ESMTP id u42IIMXd025503; Mon, 2 May 2016 18:18:22 GMT Received: from localhost.us.oracle.com (/10.211.47.181) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 02 May 2016 11:18:21 -0700 From: Liu Bo To: linux-btrfs@vger.kernel.org Cc: vegard.nossum@oracle.com, sterba@suse.com Subject: [PATCH 2/3] Btrfs-progs: add three more valid checks for superblock Date: Mon, 2 May 2016 11:18:54 -0700 Message-Id: <1462213135-29678-2-git-send-email-bo.li.liu@oracle.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1462213135-29678-1-git-send-email-bo.li.liu@oracle.com> References: <1462213135-29678-1-git-send-email-bo.li.liu@oracle.com> X-Source-IP: aserv0022.oracle.com [141.146.126.234] Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This adds valid checks for super_total_bytes, super_bytes_used and super_stripesize. Since these checks are made after superblock finishes checksum checking, this also adds a notice of "superblock checksum match but..". This also replaces different kinds of printf with helper error() and warning(). Reported-by: Vegard Nossum Reported-by: Quentin Casasnovas Signed-off-by: Liu Bo --- disk-io.c | 95 +++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 53 insertions(+), 42 deletions(-) diff --git a/disk-io.c b/disk-io.c index 4302e80..6fcca42 100644 --- a/disk-io.c +++ b/disk-io.c @@ -1397,14 +1397,13 @@ static int check_super(struct btrfs_super_block *sb) int csum_size; if (btrfs_super_magic(sb) != BTRFS_MAGIC) { - fprintf(stderr, "ERROR: superblock magic doesn't match\n"); + error("superblock magic doesn't match"); return -EIO; } csum_type = btrfs_super_csum_type(sb); if (csum_type >= ARRAY_SIZE(btrfs_csum_sizes)) { - fprintf(stderr, "ERROR: unsupported checksum algorithm %u\n", - csum_type); + error("unsupported checksum algorithm %u\n", csum_type); return -EIO; } csum_size = btrfs_csum_sizes[csum_type]; @@ -1415,59 +1414,68 @@ static int check_super(struct btrfs_super_block *sb) btrfs_csum_final(crc, result); if (memcmp(result, sb->csum, csum_size)) { - fprintf(stderr, "ERROR: superblock checksum mismatch\n"); + error("superblock checksum mismatch"); return -EIO; } if (btrfs_super_root_level(sb) >= BTRFS_MAX_LEVEL) { - fprintf(stderr, "ERROR: tree_root level too big: %d >= %d\n", + error("tree_root level too big: %d >= %d", btrfs_super_root_level(sb), BTRFS_MAX_LEVEL); - return -EIO; + goto error_out; } if (btrfs_super_chunk_root_level(sb) >= BTRFS_MAX_LEVEL) { - fprintf(stderr, "ERROR: chunk_root level too big: %d >= %d\n", + error("chunk_root level too big: %d >= %d", btrfs_super_chunk_root_level(sb), BTRFS_MAX_LEVEL); - return -EIO; + goto error_out; } if (btrfs_super_log_root_level(sb) >= BTRFS_MAX_LEVEL) { - fprintf(stderr, "ERROR: log_root level too big: %d >= %d\n", + error("log_root level too big: %d >= %d", btrfs_super_log_root_level(sb), BTRFS_MAX_LEVEL); - return -EIO; + goto error_out; } if (!IS_ALIGNED(btrfs_super_root(sb), 4096)) { - fprintf(stderr, "ERROR: tree_root block unaligned: %llu\n", - btrfs_super_root(sb)); - return -EIO; + error("tree_root block unaligned: %llu", btrfs_super_root(sb)); + goto error_out; } if (!IS_ALIGNED(btrfs_super_chunk_root(sb), 4096)) { - fprintf(stderr, "ERROR: chunk_root block unaligned: %llu\n", + error("chunk_root block unaligned: %llu", btrfs_super_chunk_root(sb)); - return -EIO; + goto error_out; } if (!IS_ALIGNED(btrfs_super_log_root(sb), 4096)) { - fprintf(stderr, "ERROR: log_root block unaligned: %llu\n", + error("log_root block unaligned: %llu", btrfs_super_log_root(sb)); - return -EIO; + goto error_out; } if (btrfs_super_nodesize(sb) < 4096) { - fprintf(stderr, "ERROR: nodesize too small: %u < 4096\n", + error("nodesize too small: %u < 4096", btrfs_super_nodesize(sb)); - return -EIO; + goto error_out; } if (!IS_ALIGNED(btrfs_super_nodesize(sb), 4096)) { - fprintf(stderr, "ERROR: nodesize unaligned: %u\n", - btrfs_super_nodesize(sb)); - return -EIO; + error("nodesize unaligned: %u", btrfs_super_nodesize(sb)); + goto error_out; } if (btrfs_super_sectorsize(sb) < 4096) { - fprintf(stderr, "ERROR: sectorsize too small: %u < 4096\n", + error("sectorsize too small: %u < 4096", btrfs_super_sectorsize(sb)); - return -EIO; + goto error_out; } if (!IS_ALIGNED(btrfs_super_sectorsize(sb), 4096)) { - fprintf(stderr, "ERROR: sectorsize unaligned: %u\n", - btrfs_super_sectorsize(sb)); - return -EIO; + error("sectorsize unaligned: %u", btrfs_super_sectorsize(sb)); + goto error_out; + } + if (btrfs_super_total_bytes(sb) == 0) { + error("invalid total_bytes 0"); + goto error_out; + } + if (btrfs_super_bytes_used(sb) < 6 * btrfs_super_nodesize(sb)) { + error("invalid bytes_used %llu", btrfs_super_bytes_used(sb)); + goto error_out; + } + if (btrfs_super_stripesize(sb) != 4096) { + error("invalid stripesize %u", btrfs_super_stripesize(sb)); + goto error_out; } if (memcmp(sb->fsid, sb->dev_item.fsid, BTRFS_UUID_SIZE) != 0) { @@ -1476,23 +1484,22 @@ static int check_super(struct btrfs_super_block *sb) uuid_unparse(sb->fsid, fsid); uuid_unparse(sb->dev_item.fsid, dev_fsid); - printk(KERN_ERR - "ERROR: dev_item UUID does not match fsid: %s != %s\n", + error("dev_item UUID does not match fsid: %s != %s", dev_fsid, fsid); - return -EIO; + goto error_out; } /* * Hint to catch really bogus numbers, bitflips or so */ if (btrfs_super_num_devices(sb) > (1UL << 31)) { - fprintf(stderr, "WARNING: suspicious number of devices: %llu\n", + warning("suspicious number of devices: %llu", btrfs_super_num_devices(sb)); } if (btrfs_super_num_devices(sb) == 0) { - fprintf(stderr, "ERROR: number of devices is 0\n"); - return -EIO; + error("number of devices is 0"); + goto error_out; } /* @@ -1500,21 +1507,25 @@ static int check_super(struct btrfs_super_block *sb) * and one chunk */ if (btrfs_super_sys_array_size(sb) > BTRFS_SYSTEM_CHUNK_ARRAY_SIZE) { - fprintf(stderr, "BTRFS: system chunk array too big %u > %u\n", - btrfs_super_sys_array_size(sb), - BTRFS_SYSTEM_CHUNK_ARRAY_SIZE); - return -EIO; + error("system chunk array too big %u > %u", + btrfs_super_sys_array_size(sb), + BTRFS_SYSTEM_CHUNK_ARRAY_SIZE); + goto error_out; } if (btrfs_super_sys_array_size(sb) < sizeof(struct btrfs_disk_key) + sizeof(struct btrfs_chunk)) { - fprintf(stderr, "BTRFS: system chunk array too small %u < %lu\n", - btrfs_super_sys_array_size(sb), - sizeof(struct btrfs_disk_key) + - sizeof(struct btrfs_chunk)); - return -EIO; + error("system chunk array too small %u < %lu", + btrfs_super_sys_array_size(sb), + sizeof(struct btrfs_disk_key) + + sizeof(struct btrfs_chunk)); + goto error_out; } return 0; + +error_out: + error("Superblock checksum match but it has invalid members, try btrfsck --repair -s ie, 0,1,2"); + return -EIO; } int btrfs_read_dev_super(int fd, struct btrfs_super_block *sb, u64 sb_bytenr,