Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5217be23 authored by Filipe Manana's avatar Filipe Manana Committed by Sasha Levin
Browse files

Btrfs: fix memory leak in the extent_same ioctl 



[ Upstream commit 497b4050e0eacd4c746dd396d14916b1e669849d ]

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: default avatarJulian Taylor <jtaylor.debian@googlemail.com>
Reported-by: default avatarMarcel Ritter <ritter.marcel@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Reviewed-by: default avatarMark Fasheh <mfasheh@suse.de>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 3c668a81

fs/btrfs/ioctl.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -2959,7 +2959,7 @@ out_unlock: 
static long btrfs_ioctl_file_extent_same(struct file *file,

static long btrfs_ioctl_file_extent_same(struct file *file,

			struct btrfs_ioctl_same_args __user *argp)

			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 btrfs_ioctl_same_extent_info *info;

	struct inode *src = file_inode(file);

	struct inode *src = file_inode(file);

	u64 off;

	u64 off;
@@ -2989,6 +2989,7 @@ static long btrfs_ioctl_file_extent_same(struct file *file, 




	if (IS_ERR(same)) {

	if (IS_ERR(same)) {

		ret = PTR_ERR(same);

		ret = PTR_ERR(same);

		same = NULL;

		goto out;

		goto out;

	}

	}
@@ -3059,6 +3060,7 @@ static long btrfs_ioctl_file_extent_same(struct file *file, 




out:

out:

	mnt_drop_write_file(file);

	mnt_drop_write_file(file);

	kfree(same);

	return ret;

	return ret;

}

}