From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from e6.ny.us.ibm.com ([32.97.182.146]:48465 "EHLO e6.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758398Ab2IEJV2 (ORCPT ); Wed, 5 Sep 2012 05:21:28 -0400 Received: from /spool/local by e6.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 5 Sep 2012 05:21:27 -0400 From: Zhi Yong Wu To: linux-btrfs@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linuxram@linux.vnet.ibm.com, Zhi Yong Wu Subject: [PATCH v2 2/2] btrfs-progs: Fix up memory leakage Date: Wed, 5 Sep 2012 17:21:07 +0800 Message-Id: <1346836867-1060-3-git-send-email-wuzhy@linux.vnet.ibm.com> In-Reply-To: <1346836867-1060-1-git-send-email-wuzhy@linux.vnet.ibm.com> References: <1346836867-1060-1-git-send-email-wuzhy@linux.vnet.ibm.com> Sender: linux-btrfs-owner@vger.kernel.org List-ID: Some code pathes forget to free memory on exit. Changelog from v1: Fix the variable is used uncorrectly. [Ram Pai] Signed-off-by: Zhi Yong Wu --- cmds-filesystem.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cmds-filesystem.c b/cmds-filesystem.c index e62c4fd..9c43d35 100644 --- a/cmds-filesystem.c +++ b/cmds-filesystem.c @@ -47,7 +47,7 @@ static const char * const cmd_df_usage[] = { static int cmd_df(int argc, char **argv) { - struct btrfs_ioctl_space_args *sargs; + struct btrfs_ioctl_space_args *sargs, *sargs_orig; u64 count = 0, i; int ret; int fd; @@ -65,7 +65,7 @@ static int cmd_df(int argc, char **argv) return 12; } - sargs = malloc(sizeof(struct btrfs_ioctl_space_args)); + sargs_orig = sargs = malloc(sizeof(struct btrfs_ioctl_space_args)); if (!sargs) return -ENOMEM; @@ -83,6 +83,7 @@ static int cmd_df(int argc, char **argv) } if (!sargs->total_spaces) { close(fd); + free(sargs); return 0; } @@ -92,6 +93,7 @@ static int cmd_df(int argc, char **argv) (count * sizeof(struct btrfs_ioctl_space_info))); if (!sargs) { close(fd); + free(sargs_orig); return -ENOMEM; } -- 1.7.6.5