summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlya Dryomov <idryomov@gmail.com>2011-11-04 14:41:02 +0100
committerChris Mason <chris.mason@oracle.com>2011-11-06 09:11:29 +0100
commit56d2a48f81a1bde827c625b90221fade72fe9c61 (patch)
tree162de09347589bc3bf9bd40f2c2ad6e32283798b
parentBtrfs: rename btrfs_bio multi -> bbio for consistency (diff)
downloadlinux-56d2a48f81a1bde827c625b90221fade72fe9c61.tar.xz
linux-56d2a48f81a1bde827c625b90221fade72fe9c61.zip
Btrfs: fix a potential btrfs_bio leak on scrub fixups
In case we were able to map less than we wanted (length < PAGE_SIZE clause is true) btrfs_bio is still allocated and we have to free it. Signed-off-by: Ilya Dryomov <idryomov@gmail.com> Signed-off-by: Chris Mason <chris.mason@oracle.com>
-rw-r--r--fs/btrfs/scrub.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index 562dad10dee9..ed11d3866afd 100644
--- a/fs/btrfs/scrub.c
+++ b/fs/btrfs/scrub.c
@@ -655,6 +655,7 @@ static void scrub_fixup(struct scrub_bio *sbio, int ix)
"scrub_fixup: btrfs_map_block failed us for %llu\n",
(unsigned long long)logical);
WARN_ON(1);
+ kfree(bbio);
return;
}