Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp8121112imu; Tue, 4 Dec 2018 03:21:56 -0800 (PST) X-Google-Smtp-Source: AFSGD/Wa/zAuLF9C94qu+pXlS4dUezB6d0n4fOhLhgOm+dVqGEi/Y2ylfdOkOpkpFesHiLSviWTG X-Received: by 2002:a63:da14:: with SMTP id c20mr15687000pgh.233.1543922516536; Tue, 04 Dec 2018 03:21:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543922516; cv=none; d=google.com; s=arc-20160816; b=d3/dGCrI3U4zuaI2z9pBIEQAY3kQnhaFwwUOGVZqF0DVJ7ff1jnBtP+zcTlQoL5YLm W7DIT2OpvlKSGPpW3bu7dVAz/ZQMRrAX17YejIkNOyhy8LM7/TqSSyKqzN2U072YUIN5 Sl6pt7EYhQwp/Jl3N7sZ3mi5SP0gIMCe5djE1ugbe751QHQa00K+lfU7J8AK9YUdUTX/ UUPmks9sSYpXhVYg3vhUwQaoCMui0BdNTFdInySw50yos5lnY3IoOYooJjVnrwtxVHQC tUsKdTISW3crbZPy5rsLvya29VGPacn+118fDRyUfHtXplJVT+Lbeb2Dx3PkD595NknT d5Dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=O8d0o767EZJAYtj6ng3szgR+YNfcLCFcQky7lf+wIls=; b=zCM5VUo3epYbNryjggLedPTQv/l03dnENsSQDJLyazT+5rUjMjPlro9MMQsbYwpW2/ VB5S+0VJ6JmXkuqelPRTPtpKca21IjpTBi8emprxlMCHjh7dFBg/fZ2MjC1NyqcOJalj 38jbf23HKi4y01X+mwPUW0DQNrxG+z+kP3sojaFuampNVQpIxa7RtVIDNaogrvNuBxxe r/mbcXS2AMnpWD0luICdUdeJU0r9XZJbtr2957utrUeUlsT3D/EXUjJ0wlHa+u1idH1M sTyh7Hx/GSgPAiM/QaP2jh+U1EDS/VKyjQ9LVNLwsGNOn9ih+5e1kZMJQDQB9j+g/6t9 tSKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=TJumK2vg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g184si17321854pfb.288.2018.12.04.03.21.41; Tue, 04 Dec 2018 03:21:56 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=TJumK2vg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727885AbeLDLDw (ORCPT + 99 others); Tue, 4 Dec 2018 06:03:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:50444 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727873AbeLDLDt (ORCPT ); Tue, 4 Dec 2018 06:03:49 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4B6D8214DE; Tue, 4 Dec 2018 11:03:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1543921428; bh=Z8+JQz/WAcAk5NbUECB1z7/j9JOusXeGQ7VuVKWNH1M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TJumK2vgbQbetDaZhUi5x3Uei7L9lZMKYzZluPN7bhe7qBCoZRLROYJaRfZaWu/SP FDIz1LFkqcvWhmY9HyfyJbqOVtZxDetoA4Kwsapb3IZSSwG3UyDvhwvNZc2drBfib6 OSb7JvSkI8eElYqTH47f0djTGSlwuYpINjcf0KQk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Qu Wenruo , Nikolay Borisov , David Sterba , Ben Hutchings , Sasha Levin Subject: [PATCH 4.14 032/146] btrfs: Add checker for EXTENT_CSUM Date: Tue, 4 Dec 2018 11:48:38 +0100 Message-Id: <20181204103728.151080174@linuxfoundation.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181204103726.750894136@linuxfoundation.org> References: <20181204103726.750894136@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ commit 4b865cab96fe2a30ed512cf667b354bd291b3b0a upstream. EXTENT_CSUM checker is a relatively easy one, only needs to check: 1) Objectid Fixed to BTRFS_EXTENT_CSUM_OBJECTID 2) Key offset alignment Must be aligned to sectorsize 3) Item size alignedment Must be aligned to csum size Signed-off-by: Qu Wenruo Reviewed-by: Nikolay Borisov Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Ben Hutchings Signed-off-by: Sasha Levin --- fs/btrfs/disk-io.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index ab8925b2efd1..53841d773a40 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -627,6 +627,27 @@ static int check_extent_data_item(struct btrfs_root *root, return 0; } +static int check_csum_item(struct btrfs_root *root, struct extent_buffer *leaf, + struct btrfs_key *key, int slot) +{ + u32 sectorsize = root->fs_info->sectorsize; + u32 csumsize = btrfs_super_csum_size(root->fs_info->super_copy); + + if (key->objectid != BTRFS_EXTENT_CSUM_OBJECTID) { + CORRUPT("invalid objectid for csum item", leaf, root, slot); + return -EUCLEAN; + } + if (!IS_ALIGNED(key->offset, sectorsize)) { + CORRUPT("unaligned key offset for csum item", leaf, root, slot); + return -EUCLEAN; + } + if (!IS_ALIGNED(btrfs_item_size_nr(leaf, slot), csumsize)) { + CORRUPT("unaligned csum item size", leaf, root, slot); + return -EUCLEAN; + } + return 0; +} + /* * Common point to switch the item-specific validation. */ @@ -640,6 +661,9 @@ static int check_leaf_item(struct btrfs_root *root, case BTRFS_EXTENT_DATA_KEY: ret = check_extent_data_item(root, leaf, key, slot); break; + case BTRFS_EXTENT_CSUM_KEY: + ret = check_csum_item(root, leaf, key, slot); + break; } return ret; } -- 2.17.1