From patchwork Mon Dec 27 06:53:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tsutomu Itoh X-Patchwork-Id: 433521 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBRKCV6p025997 for ; Mon, 27 Dec 2010 20:14:44 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752890Ab0L0GxV (ORCPT ); Mon, 27 Dec 2010 01:53:21 -0500 Received: from fgwmail6.fujitsu.co.jp ([192.51.44.36]:46215 "EHLO fgwmail6.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751161Ab0L0GxV (ORCPT ); Mon, 27 Dec 2010 01:53:21 -0500 Received: from m4.gw.fujitsu.co.jp ([10.0.50.74]) by fgwmail6.fujitsu.co.jp (Fujitsu Gateway) with ESMTP id oBR6rJwe004937 for (envelope-from t-itoh@jp.fujitsu.com); Mon, 27 Dec 2010 15:53:19 +0900 Received: from smail (m4 [127.0.0.1]) by outgoing.m4.gw.fujitsu.co.jp (Postfix) with ESMTP id 3A90945DE8E for ; Mon, 27 Dec 2010 15:53:19 +0900 (JST) Received: from s4.gw.fujitsu.co.jp (s4.gw.fujitsu.co.jp [10.0.50.94]) by m4.gw.fujitsu.co.jp (Postfix) with ESMTP id 1EDD445DE8A for ; Mon, 27 Dec 2010 15:53:19 +0900 (JST) Received: from s4.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s4.gw.fujitsu.co.jp (Postfix) with ESMTP id 115991DB8045 for ; Mon, 27 Dec 2010 15:53:19 +0900 (JST) Received: from m105.s.css.fujitsu.com (m105.s.css.fujitsu.com [10.249.87.105]) by s4.gw.fujitsu.co.jp (Postfix) with ESMTP id BCEDF1DB8037 for ; Mon, 27 Dec 2010 15:53:18 +0900 (JST) Received: from m105.css.fujitsu.com (m105 [127.0.0.1]) by m105.s.css.fujitsu.com (Postfix) with ESMTP id 84BF35D8003 for ; Mon, 27 Dec 2010 15:53:18 +0900 (JST) Received: from [127.0.0.1] (unknown [10.124.101.86]) by m105.s.css.fujitsu.com (Postfix) with ESMTP id 1B7505D8001 for ; Mon, 27 Dec 2010 15:53:18 +0900 (JST) X-SecurityPolicyCheck-FJ: OK by FujitsuOutboundMailChecker v1.4.0 Received: from T-ITOH1[10.124.101.86] by T-ITOH1 (FujitsuOutboundMailChecker v1.4.0/9992[10.124.101.86]); Mon, 27 Dec 2010 15:53:20 +0900 (JST) Message-ID: <4D1837D6.4080901@jp.fujitsu.com> Date: Mon, 27 Dec 2010 15:53:10 +0900 From: Tsutomu Itoh User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.13) Gecko/20101207 Thunderbird/3.1.7 MIME-Version: 1.0 To: Linux Btrfs Subject: [PATCH] btrfs: Fix memory leak in btrfs_read_fs_root_no_radix() Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 27 Dec 2010 20:14:44 +0000 (UTC) diff -urNp linux-2.6.37-rc7/fs/btrfs/disk-io.c linux-2.6.37-rc7.new/fs/btrfs/disk-io.c --- linux-2.6.37-rc7/fs/btrfs/disk-io.c 2010-12-22 04:26:40.000000000 +0900 +++ linux-2.6.37-rc7.new/fs/btrfs/disk-io.c 2010-12-27 15:21:19.000000000 +0900 @@ -1145,6 +1145,7 @@ struct btrfs_root *btrfs_read_fs_root_no } btrfs_free_path(path); if (ret) { + kfree(root); if (ret > 0) ret = -ENOENT; return ERR_PTR(ret);