Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965098AbbHDOm0 (ORCPT ); Tue, 4 Aug 2015 10:42:26 -0400 Received: from mx2.suse.de ([195.135.220.15]:59255 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965024AbbHDOmX (ORCPT ); Tue, 4 Aug 2015 10:42:23 -0400 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" From: Jiri Slaby To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Filipe Manana , Jiri Slaby Subject: [PATCH 3.12 095/123] Btrfs: fix memory leak in the extent_same ioctl Date: Tue, 4 Aug 2015 16:40:39 +0200 Message-Id: <30f9f03c581a86ae1fe575b0645cc5fa9bf4ce88.1438699154.git.jslaby@suse.cz> X-Mailer: git-send-email 2.5.0 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1677 Lines: 53 From: Filipe Manana 3.12-stable review patch. If anyone has any objections, please let me know. =============== commit 497b4050e0eacd4c746dd396d14916b1e669849d upstream. 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 Reported-by: Marcel Ritter Signed-off-by: Filipe Manana Reviewed-by: Mark Fasheh Signed-off-by: Jiri Slaby --- fs/btrfs/ioctl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index d43cd15c3097..5f597cf570be 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -2707,7 +2707,7 @@ static long btrfs_ioctl_file_extent_same(struct file *file, void __user *argp) { struct btrfs_ioctl_same_args tmp; - struct btrfs_ioctl_same_args *same; + struct btrfs_ioctl_same_args *same = NULL; struct btrfs_ioctl_same_extent_info *info; struct inode *src = file->f_dentry->d_inode; struct file *dst_file = NULL; @@ -2833,6 +2833,7 @@ next: out: mnt_drop_write_file(file); + kfree(same); return ret; } -- 2.5.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/