From patchwork Sun Mar 28 16:00:25 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Julia Lawall <julia@diku.dk>
X-Patchwork-Id: 88785
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2SG0v6l010073
	for <patchwork-linux-btrfs@patchwork.kernel.org>;
	Sun, 28 Mar 2010 16:00:57 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754713Ab0C1QAb (ORCPT
	<rfc822;patchwork-linux-btrfs@patchwork.kernel.org>);
	Sun, 28 Mar 2010 12:00:31 -0400
Received: from mgw1.diku.dk ([130.225.96.91]:46595 "EHLO mgw1.diku.dk"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754673Ab0C1QAa (ORCPT <rfc822;linux-btrfs@vger.kernel.org>);
	Sun, 28 Mar 2010 12:00:30 -0400
Received: from localhost (localhost [127.0.0.1])
	by mgw1.diku.dk (Postfix) with ESMTP id C751D52C3BF;
	Sun, 28 Mar 2010 18:00:29 +0200 (CEST)
X-Virus-Scanned: amavisd-new at diku.dk
Received: from mgw1.diku.dk ([127.0.0.1])
	by localhost (mgw1.diku.dk [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id usfGDbbMZidp; Sun, 28 Mar 2010 18:00:25 +0200 (CEST)
Received: from nhugin.diku.dk (nhugin.diku.dk [130.225.96.140])
	by mgw1.diku.dk (Postfix) with ESMTP id 827A452C436;
	Sun, 28 Mar 2010 18:00:25 +0200 (CEST)
Received: from ask.diku.dk (ask.diku.dk [130.225.96.225])
	by nhugin.diku.dk (Postfix) with ESMTP
	id 0859C6DFB78; Sun, 28 Mar 2010 17:54:17 +0200 (CEST)
Received: by ask.diku.dk (Postfix, from userid 3767)
	id 458AC200B0; Sun, 28 Mar 2010 18:00:25 +0200 (CEST)
Received: from localhost (localhost [127.0.0.1])
	by ask.diku.dk (Postfix) with ESMTP id 3E7BA200AF;
	Sun, 28 Mar 2010 18:00:25 +0200 (CEST)
Date: Sun, 28 Mar 2010 18:00:25 +0200 (CEST)
From: Julia Lawall <julia@diku.dk>
To: Chris Mason <chris.mason@oracle.com>, linux-btrfs@vger.kernel.org,
	linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [PATCH] fs/btrfs: Correct use after free
Message-ID: <Pine.LNX.4.64.1003281800020.29824@ask.diku.dk>
MIME-Version: 1.0
Sender: linux-btrfs-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-btrfs.vger.kernel.org>
X-Mailing-List: linux-btrfs@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Sun, 28 Mar 2010 16:00:57 +0000 (UTC)


diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 2845c6c..dacbb52 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -1375,6 +1375,7 @@ static int btrfs_ioctl_defrag(struct file *file, void __user *argp)
 					   sizeof(*range))) {
 				ret = -EFAULT;
 				kfree(range);
+				goto out;
 			}
 			/* compression requires us to start the IO */
 			if ((range->flags & BTRFS_DEFRAG_RANGE_COMPRESS)) {