diff mbox

[v2] Btrfs: fix error check of btrfs_lookup_dentry()

Message ID 201106280553.AA00028@T-ITOH1.jp.fujitsu.com (mailing list archive)
State Superseded, archived
Headers show

Commit Message

Tsutomu Itoh June 28, 2011, 5:53 a.m. UTC 
The return value of btrfs_lookup_dentry is checked so that
the panic such as illegal address reference should not occur.

Signed-off-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com>
---
V1 -> V2: unnecessary BUG_ON was deleted

 fs/btrfs/ioctl.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)



--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index a3c4751..39c62d3 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -325,6 +325,7 @@  static noinline int create_subvol(struct btrfs_root *root,
 	struct btrfs_root *new_root;
 	struct dentry *parent = dget_parent(dentry);
 	struct inode *dir;
+	struct inode *inode;
 	int ret;
 	int err;
 	u64 objectid;
@@ -437,7 +438,14 @@  static noinline int create_subvol(struct btrfs_root *root,
 
 	BUG_ON(ret);
 
-	d_instantiate(dentry, btrfs_lookup_dentry(dir, dentry));
+	inode = btrfs_lookup_dentry(dir, dentry);
+	if (IS_ERR(inode)) {
+		ret = PTR_ERR(inode);
+		goto fail;
+	}
+	BUG_ON(!inode);
+
+	d_instantiate(dentry, inode);
 fail:
 	dput(parent);
 	if (async_transid) {