linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Liu Bo <bo.li.liu@oracle.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH 1/6] Btrfs: add a helper to retrive extent inline ref type
Date: Thu, 25 May 2017 18:26:26 -0600	[thread overview]
Message-ID: <20170526002631.8546-2-bo.li.liu@oracle.com> (raw)
In-Reply-To: <20170526002631.8546-1-bo.li.liu@oracle.com>

An invalid value of extent inline ref type may be read from a
malicious image which may force btrfs to crash.

This adds a helper which does sanity check for the ref type, so we can
know if it's sane, return type if so, otherwise return an error.

Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
---
 fs/btrfs/ctree.h       |  4 ++++
 fs/btrfs/extent-tree.c | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index c411590..206ae8c 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -2542,6 +2542,10 @@ static inline gfp_t btrfs_alloc_write_mask(struct address_space *mapping)
 
 /* extent-tree.c */
 
+int btrfs_get_extent_inline_ref_type(struct extent_buffer *eb,
+				     struct btrfs_extent_inline_ref *iref,
+				     int is_data);
+
 u64 btrfs_csum_bytes_to_leaves(struct btrfs_fs_info *fs_info, u64 csum_bytes);
 
 static inline u64 btrfs_calc_trans_metadata_size(struct btrfs_fs_info *fs_info,
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index be54776..fba8ca0 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -1117,6 +1117,41 @@ static int convert_extent_item_v0(struct btrfs_trans_handle *trans,
 }
 #endif
 
+/*
+ * is_data == 0, tree block type is required,
+ * is_data == 1, data type is requried,
+ * is_data == 2, either type is OK.
+ */
+int btrfs_get_extent_inline_ref_type(struct extent_buffer *eb,
+				     struct btrfs_extent_inline_ref *iref,
+				     int is_data)
+{
+	int type = btrfs_extent_inline_ref_type(eb, iref);
+
+	if (type == BTRFS_TREE_BLOCK_REF_KEY ||
+	    type == BTRFS_SHARED_BLOCK_REF_KEY ||
+	    type == BTRFS_SHARED_DATA_REF_KEY ||
+	    type == BTRFS_EXTENT_DATA_REF_KEY) {
+		if (is_data == 2) {
+			return type;
+		} else if (is_data == 1) {
+			if (type == BTRFS_EXTENT_DATA_REF_KEY ||
+			    type == BTRFS_SHARED_DATA_REF_KEY)
+				return type;
+		} else {
+			if (type == BTRFS_TREE_BLOCK_REF_KEY ||
+			    type == BTRFS_SHARED_BLOCK_REF_KEY)
+				return type;
+		}
+	}
+
+	btrfs_print_leaf(eb->fs_info, eb);
+	WARN(1, "eb %llu(%s block) invalid extent inline ref type %d\n",
+	     eb->start, (is_data) ? "data" : "tree", type);
+
+	return -EINVAL;
+}
+
 static u64 hash_extent_data_ref(u64 root_objectid, u64 owner, u64 offset)
 {
 	u32 high_crc = ~(u32)0;
-- 
2.9.4


  reply	other threads:[~2017-05-26  1:27 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-26  0:26 [PATCH 0/6] add sanity check for extent inline ref type Liu Bo
2017-05-26  0:26 ` Liu Bo [this message]
2017-05-26  7:09   ` [PATCH 1/6] Btrfs: add a helper to retrive " Nikolay Borisov
2017-05-26 17:44     ` Jeff Mahoney
2017-05-26 18:13     ` David Sterba
2017-05-26 18:15       ` David Sterba
2017-05-26  0:26 ` [PATCH 2/6] Btrfs: convert to use btrfs_get_extent_inline_ref_type Liu Bo
2017-05-26  0:26 ` [PATCH 3/6] Btrfs: remove BUG() in btrfs_extent_inline_ref_size Liu Bo
2017-05-26  0:26 ` [PATCH 4/6] Btrfs: remove BUG() in print_extent_item Liu Bo
2017-05-26 18:18   ` David Sterba
2017-05-26 19:52     ` Liu Bo
2017-05-26  0:26 ` [PATCH 5/6] Btrfs: remove BUG() in add_data_reference Liu Bo
2017-05-26 18:20   ` David Sterba
2017-05-26 20:01     ` Liu Bo
2017-05-26  0:26 ` [PATCH 6/6] Btrfs: add sanity check of extent item in scrub Liu Bo
2017-05-26 18:33   ` David Sterba
2017-05-26 20:20     ` Liu Bo
2017-05-29  1:48       ` Qu Wenruo
2017-05-29 13:49         ` David Sterba
2017-05-30 14:05 ` [PATCH 0/6] add sanity check for extent inline ref type Ivan Sizov
2017-05-30 18:02   ` Liu Bo
2017-05-30 18:57     ` Ivan Sizov
2017-06-01 17:35   ` Liu Bo
2017-06-01 20:26     ` Ivan Sizov
2017-06-01 22:57       ` Liu Bo
2017-06-19  9:06         ` Ivan Sizov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170526002631.8546-2-bo.li.liu@oracle.com \
    --to=bo.li.liu@oracle.com \
    --cc=linux-btrfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).