From patchwork Wed Sep 19 18:40:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Goffredo Baroncelli X-Patchwork-Id: 10606181 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9317217E1 for ; Wed, 19 Sep 2018 18:41:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 82A052C841 for ; Wed, 19 Sep 2018 18:41:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 773BE2C853; Wed, 19 Sep 2018 18:41:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1A29A2C841 for ; Wed, 19 Sep 2018 18:41:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732432AbeITAUZ (ORCPT ); Wed, 19 Sep 2018 20:20:25 -0400 Received: from smtp-33-i6.italiaonline.it ([213.209.14.33]:49412 "EHLO libero.it" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727804AbeITAUY (ORCPT ); Wed, 19 Sep 2018 20:20:24 -0400 Received: from venice.bhome ([94.38.18.13]) by smtp-33.iol.local with ESMTPA id 2hPRgg79sQGOz2hPTgVZp9; Wed, 19 Sep 2018 20:41:11 +0200 x-libjamoibt: 1601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2014; t=1537382471; bh=kMdZT04l9aiWKWnBTwL1OHC738fR1K7NoppWuTo4EZc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WpCX/hzTqiSbMYLijFkhZB0Q+wTMZFfxV50uNLnNu7MsBykzckCOtqmp2NSD9hagR qZ1xY+7WtEn2+m0aMykTke/cluSpw6w1qLms9UqLEF6IRoqlBc2vEkwKc94tMa52mB DiQMc9V2of5XzLJUEmlTywmsp6ApEKP95y+Vuko7nbmDwZrDz14WSIBz8nsF1KnfHr m9s789SXQwMNJi6mCwGdGvWZJpdPfL5700AhZ9tCtrBY5xtG32EsgMSqPSU8fSsWgE qgemgmRD5rCASGxyXrcFMf1+KUiKle2G+vVwRwQcPwxuzdqKxu5SVX+Y1XGXAa+XVB W6sL/dDhv/aCw== X-CNFS-Analysis: v=2.3 cv=OvCeNB3t c=1 sm=1 tr=0 a=y+pHRDKYf/eurU+tzaSv/w==:117 a=y+pHRDKYf/eurU+tzaSv/w==:17 a=yPCof4ZbAAAA:8 a=GjNF4_zslFSpHsoFBLgA:9 From: Goffredo Baroncelli To: grub-devel@gnu.org Cc: Daniel Kiper , linux-btrfs@vger.kernel.org, Goffredo Baroncelli Subject: [PATCH 2/9] btrfs: Add helper to check the btrfs header. Date: Wed, 19 Sep 2018 20:40:33 +0200 Message-Id: <20180919184040.22540-3-kreijack@libero.it> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20180919184040.22540-1-kreijack@libero.it> References: <20180919184040.22540-1-kreijack@libero.it> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfDPsmObly8e/k5E4XFRJXOI/IWpTHcTuN4PjnH30VL0BdRINHzP/xGM0hUKtYfZBlhbjzxPjkE67N/jK8qyb+JSBdqaurnf+n2/6GHiBl/7CFdEyt5fV ri0xX8kfGbURdtJIJyl1wgg5b79eB2nJe081yJPeLyXHTXWthywHYWaCUz46ow6LGTdBqooL/yu+DVMB9xBtM/nGEHEsLnXoHc7LAk+OI7pdebenL8xMWdnr zqYdyYzFVOAuub0qdj6027V0y4PMEWaWUINjH8XXK60= Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Goffredo Baroncelli This helper is used in a few places to help the debugging. As conservative approach the error is only logged. This does not impact the error handling. Signed-off-by: Goffredo Baroncelli Reviewed-by: Daniel Kiper --- grub-core/fs/btrfs.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c index 56c42746d..4f404f4b2 100644 --- a/grub-core/fs/btrfs.c +++ b/grub-core/fs/btrfs.c @@ -77,7 +77,8 @@ struct btrfs_header { grub_btrfs_checksum_t checksum; grub_btrfs_uuid_t uuid; - grub_uint8_t dummy[0x30]; + grub_uint64_t bytenr; + grub_uint8_t dummy[0x28]; grub_uint32_t nitems; grub_uint8_t level; } GRUB_PACKED; @@ -286,6 +287,25 @@ free_iterator (struct grub_btrfs_leaf_descriptor *desc) grub_free (desc->data); } +static grub_err_t +check_btrfs_header (struct grub_btrfs_data *data, struct btrfs_header *header, + grub_disk_addr_t addr) +{ + if (grub_le_to_cpu64 (header->bytenr) != addr) + { + grub_dprintf ("btrfs", "btrfs_header.bytenr is not equal node addr\n"); + return grub_error (GRUB_ERR_BAD_FS, + "header bytenr is not equal node addr"); + } + if (grub_memcmp (data->sblock.uuid, header->uuid, sizeof(grub_btrfs_uuid_t))) + { + grub_dprintf ("btrfs", "btrfs_header.uuid doesn't match sblock uuid\n"); + return grub_error (GRUB_ERR_BAD_FS, + "header uuid doesn't match sblock uuid"); + } + return GRUB_ERR_NONE; +} + static grub_err_t save_ref (struct grub_btrfs_leaf_descriptor *desc, grub_disk_addr_t addr, unsigned i, unsigned m, int l) @@ -341,6 +361,7 @@ next (struct grub_btrfs_data *data, err = grub_btrfs_read_logical (data, grub_le_to_cpu64 (node.addr), &head, sizeof (head), 0); + check_btrfs_header (data, &head, grub_le_to_cpu64 (node.addr)); if (err) return -err; @@ -402,6 +423,7 @@ lower_bound (struct grub_btrfs_data *data, /* FIXME: preread few nodes into buffer. */ err = grub_btrfs_read_logical (data, addr, &head, sizeof (head), recursion_depth + 1); + check_btrfs_header (data, &head, addr); if (err) return err; addr += sizeof (head);