Skip to content

Commit

Permalink
Btrfs: fix memory leak in the extent_same ioctl
Browse files Browse the repository at this point in the history
We were allocating memory with memdup_user() but we were never releasing
that memory. This affected pretty much every call to the ioctl, whether
it deduplicated extents or not.

This issue was reported on IRC by Julian Taylor and on the mailing list
by Marcel Ritter, credit goes to them for finding the issue.

Reported-by: Julian Taylor <jtaylor.debian@googlemail.com>
Reported-by: Marcel Ritter <ritter.marcel@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: Mark Fasheh <mfasheh@suse.de>
  • Loading branch information
Filipe Manana committed Jul 11, 2015
1 parent c1aa457 commit 497b405
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion fs/btrfs/ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -3090,7 +3090,7 @@ static int btrfs_extent_same(struct inode *src, u64 loff, u64 olen,
static long btrfs_ioctl_file_extent_same(struct file *file,
struct btrfs_ioctl_same_args __user *argp)
{
struct btrfs_ioctl_same_args *same;
struct btrfs_ioctl_same_args *same = NULL;
struct btrfs_ioctl_same_extent_info *info;
struct inode *src = file_inode(file);
u64 off;
Expand Down Expand Up @@ -3120,6 +3120,7 @@ static long btrfs_ioctl_file_extent_same(struct file *file,

if (IS_ERR(same)) {
ret = PTR_ERR(same);
same = NULL;
goto out;
}

Expand Down Expand Up @@ -3190,6 +3191,7 @@ static long btrfs_ioctl_file_extent_same(struct file *file,

out:
mnt_drop_write_file(file);
kfree(same);
return ret;
}

Expand Down

0 comments on commit 497b405

Please sign in to comment.