From patchwork Mon Jun 10 19:51:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 2698941 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id B664FDF264 for ; Mon, 10 Jun 2013 19:52:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752494Ab3FJTwX (ORCPT ); Mon, 10 Jun 2013 15:52:23 -0400 Received: from mail-we0-f171.google.com ([74.125.82.171]:34861 "EHLO mail-we0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752205Ab3FJTwW (ORCPT ); Mon, 10 Jun 2013 15:52:22 -0400 Received: by mail-we0-f171.google.com with SMTP id m46so5289903wev.30 for ; Mon, 10 Jun 2013 12:52:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=Xbvhw+Djl7aSMn5RW9sPdd6oE5k9IXzBx6MvD4TU7k0=; b=Iw7jn8e4dk5UsBtWZyW+6lNiExqLQBGoK9fmCw2JGIJif+uqAear2LtQFNaArfY/M/ o+zqFqm+OqUBHFmZT8sqzH64L52xf77Fg2r+RsTljm6jLM71v5VrSz16oRzP31VGKSXV d9ACJpetLNfFcRUaort6acjy0tKGR9uONGGsIGCuvboWmXYKewwU57jV7TnzGSQMm53l +H4YdF04SDsUnIGR4tefaAON2ADXJGaMIsjmkm9w5QSfGSdpm2O7RbPZZW/rC1TtPEIc QmCOrqyqfc17KDt11LgnYQCSZPdHJZ5f1lFf1+thTDL7xUImYX3Sc1N0ovwGMH3ICvtR iVdg== X-Received: by 10.194.93.74 with SMTP id cs10mr6710262wjb.9.1370893940820; Mon, 10 Jun 2013 12:52:20 -0700 (PDT) Received: from storm-desktop.lan (bl9-171-73.dsl.telepac.pt. [85.242.171.73]) by mx.google.com with ESMTPSA id dj7sm13607906wib.6.2013.06.10.12.52.19 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Jun 2013 12:52:20 -0700 (PDT) From: Filipe David Borba Manana To: linux-btrfs@vger.kernel.org Cc: Filipe David Borba Manana Subject: [PATCH 5/5] Btrfs-progs: Validate super block checksum Date: Mon, 10 Jun 2013 20:51:35 +0100 Message-Id: <1370893895-24884-6-git-send-email-fdmanana@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1370893895-24884-1-git-send-email-fdmanana@gmail.com> References: <1370893895-24884-1-git-send-email-fdmanana@gmail.com> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org After finding a super block in a device also validate its checksum. This validation is done in the kernel but it was missing in btrfs-progs. The function btrfs_check_super_csum() is imported from the file fs/btrfs/disk-io.c in the kernel source tree. Signed-off-by: Filipe David Borba Manana --- disk-io.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 62 insertions(+), 14 deletions(-) diff --git a/disk-io.c b/disk-io.c index bd9cf4e..edd4d52 100644 --- a/disk-io.c +++ b/disk-io.c @@ -1085,47 +1085,95 @@ struct btrfs_root *open_ctree_fd(int fp, const char *path, u64 sb_bytenr, return info->fs_root; } +static int btrfs_check_super_csum(char *raw_disk_sb) +{ + struct btrfs_super_block *disk_sb = + (struct btrfs_super_block *)raw_disk_sb; + u16 csum_type = btrfs_super_csum_type(disk_sb); + int ret = 0; + + if (csum_type == BTRFS_CSUM_TYPE_CRC32) { + u32 crc = ~(u32)0; + const int csum_size = sizeof(crc); + char result[csum_size]; + + /* + * The super_block structure does not span the whole + * BTRFS_SUPER_INFO_SIZE range, we expect that the unused space + * is filled with zeros and is included in the checkum. + */ + crc = btrfs_csum_data(NULL, raw_disk_sb + BTRFS_CSUM_SIZE, + crc, BTRFS_SUPER_INFO_SIZE - BTRFS_CSUM_SIZE); + btrfs_csum_final(crc, result); + + if (memcmp(raw_disk_sb, result, csum_size)) + ret = 1; + + if (ret && btrfs_super_generation(disk_sb) < 10) { + fprintf(stderr, "btrfs: super block crcs don't match, " + "older mkfs detected\n"); + ret = 0; + } + } + + if (csum_type >= ARRAY_SIZE(btrfs_csum_sizes)) { + fprintf(stderr, "btrfs: unsupported checksum algorithm %u\n", + csum_type); + ret = 1; + } + + return ret; +} + int btrfs_read_dev_super(int fd, struct btrfs_super_block *sb, u64 sb_bytenr) { u8 fsid[BTRFS_FSID_SIZE]; int fsid_is_initialized = 0; - struct btrfs_super_block buf; + char buf[BTRFS_SUPER_INFO_SIZE]; + struct btrfs_super_block *tmp_sb; int i; int ret; u64 transid = 0; u64 bytenr; if (sb_bytenr != BTRFS_SUPER_INFO_OFFSET) { - ret = pread64(fd, &buf, sizeof(buf), sb_bytenr); + ret = pread64(fd, buf, sizeof(buf), sb_bytenr); if (ret < sizeof(buf)) return -1; - if (btrfs_super_bytenr(&buf) != sb_bytenr || - buf.magic != cpu_to_le64(BTRFS_MAGIC)) + tmp_sb = (struct btrfs_super_block *)buf; + + if (btrfs_super_bytenr(tmp_sb) != sb_bytenr || + tmp_sb->magic != cpu_to_le64(BTRFS_MAGIC) || + btrfs_check_super_csum(buf)) return -1; - memcpy(sb, &buf, sizeof(*sb)); + memcpy(sb, buf, sizeof(*sb)); return 0; } for (i = 0; i < BTRFS_SUPER_MIRROR_MAX; i++) { bytenr = btrfs_sb_offset(i); - ret = pread64(fd, &buf, sizeof(buf), bytenr); + ret = pread64(fd, buf, sizeof(buf), bytenr); if (ret < sizeof(buf)) break; - if (btrfs_super_bytenr(&buf) != bytenr ) + tmp_sb = (struct btrfs_super_block *)buf; + + if (btrfs_super_bytenr(tmp_sb) != bytenr ) continue; /* if magic is NULL, the device was removed */ - if (buf.magic == 0 && i == 0) + if (tmp_sb->magic == 0 && i == 0) return -1; - if (buf.magic != cpu_to_le64(BTRFS_MAGIC)) + if (tmp_sb->magic != cpu_to_le64(BTRFS_MAGIC)) + continue; + if (btrfs_check_super_csum(buf)) continue; if (!fsid_is_initialized) { - memcpy(fsid, buf.fsid, sizeof(fsid)); + memcpy(fsid, tmp_sb->fsid, sizeof(fsid)); fsid_is_initialized = 1; - } else if (memcmp(fsid, buf.fsid, sizeof(fsid))) { + } else if (memcmp(fsid, tmp_sb->fsid, sizeof(fsid))) { /* * the superblocks (the original one and * its backups) contain data of different @@ -1134,9 +1182,9 @@ int btrfs_read_dev_super(int fd, struct btrfs_super_block *sb, u64 sb_bytenr) continue; } - if (btrfs_super_generation(&buf) > transid) { - memcpy(sb, &buf, sizeof(*sb)); - transid = btrfs_super_generation(&buf); + if (btrfs_super_generation(tmp_sb) > transid) { + memcpy(sb, buf, sizeof(*sb)); + transid = btrfs_super_generation(tmp_sb); } }