summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/disk-io.c
diff options
context:
space:
mode:
authorJim Meyering2008-10-02 01:09:04 +0200
committerChris Mason2008-10-02 01:09:04 +0200
commit0463bb4e8d2f717a9bf3be6cc12c0aec51cc261d (patch)
tree08d4cfb8e0ddbada2399e2d4477fdf29b2521cd3 /fs/btrfs/disk-io.c
parentBtrfs: fix multi-device code to use raid policies set by mkfs (diff)
downloadkernel-qcow2-linux-0463bb4e8d2f717a9bf3be6cc12c0aec51cc261d.tar.gz
kernel-qcow2-linux-0463bb4e8d2f717a9bf3be6cc12c0aec51cc261d.tar.xz
kernel-qcow2-linux-0463bb4e8d2f717a9bf3be6cc12c0aec51cc261d.zip
Btrfs: disk-io.c (open_ctree): Don't deref. NULL upon failed kzalloc
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/disk-io.c')
-rw-r--r--fs/btrfs/disk-io.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 5ee10d3136f5..41b7d24d07e2 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1371,7 +1371,8 @@ struct btrfs_root *open_ctree(struct super_block *sb,
struct btrfs_super_block *disk_super;
- if (!extent_root || !tree_root || !fs_info) {
+ if (!extent_root || !tree_root || !fs_info ||
+ !chunk_root || !dev_root) {
err = -ENOMEM;
goto fail;
}