aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2010-11-21 22:27:44 -0500
committerChris Mason <chris.mason@oracle.com>2010-11-21 22:27:44 -0500
commit45f49bce99d008d6864a20324548f35936ba46fb (patch)
tree9bae14a5fa0b68573758dcc1aaaa176f4a62c6b8 /fs/btrfs
parentBtrfs: make btrfs_add_nondir take parent inode as an argument (diff)
downloadlinux-dev-45f49bce99d008d6864a20324548f35936ba46fb.tar.xz
linux-dev-45f49bce99d008d6864a20324548f35936ba46fb.zip
Btrfs: avoid NULL pointer deref in try_release_extent_buffer
If we fail to find a pointer in the radix tree, don't try to deref the NULL one we do have. Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs')
-rw-r--r--fs/btrfs/extent_io.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index f60aa3c35c23..143d3f541d64 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -3837,8 +3837,10 @@ int try_release_extent_buffer(struct extent_io_tree *tree, struct page *page)
spin_lock(&tree->buffer_lock);
eb = radix_tree_lookup(&tree->buffer, start >> PAGE_CACHE_SHIFT);
- if (!eb)
- goto out;
+ if (!eb) {
+ spin_unlock(&tree->buffer_lock);
+ return ret;
+ }
if (test_bit(EXTENT_BUFFER_DIRTY, &eb->bflags)) {
ret = 0;