From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753394AbdEQAAq (ORCPT ); Tue, 16 May 2017 20:00:46 -0400 Received: from LGEAMRELO12.lge.com ([156.147.23.52]:51310 "EHLO lgeamrelo12.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752198AbdEQAAn (ORCPT ); Tue, 16 May 2017 20:00:43 -0400 X-Original-SENDERIP: 156.147.1.127 X-Original-MAILFROM: cheol.lee@lge.com X-Original-SENDERIP: 165.244.249.23 X-Original-MAILFROM: cheol.lee@lge.com X-Original-SENDERIP: 10.177.225.40 X-Original-MAILFROM: cheol.lee@lge.com From: Hyunchul Lee To: Richard Weinberger CC: Artem Bityutskiy , , , , , Subject: [PATCH 2/2] ubifs: Fix memory leak in RENAME_WHITEOUT error path in do_rename Date: Wed, 17 May 2017 08:58:02 +0900 Message-ID: <1494979082-19414-1-git-send-email-cheol.lee@lge.com> X-Mailer: git-send-email 1.9.1 X-MIMETrack: Itemize by SMTP Server on LGEKRMHUB04/LGE/LG Group(Release 8.5.3FP6|November 21, 2013) at 2017/05/17 08:58:04, Serialize by Router on LGEKRMHUB04/LGE/LG Group(Release 8.5.3FP6|November 21, 2013) at 2017/05/17 08:58:04, Serialize complete at 2017/05/17 08:58:04 MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org in RENAME_WHITEOUT error path, fscrypt_name should be freed. Signed-off-by: Hyunchul Lee --- fs/ubifs/dir.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index df67236..0d5f8e7 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c @@ -1385,17 +1385,14 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry, dev = kmalloc(sizeof(union ubifs_dev_desc), GFP_NOFS); if (!dev) { - ubifs_release_budget(c, &req); - ubifs_release_budget(c, &ino_req); - return -ENOMEM; + err = -ENOMEM; + goto out_release; } err = do_tmpfile(old_dir, old_dentry, S_IFCHR | WHITEOUT_MODE, &whiteout); if (err) { - ubifs_release_budget(c, &req); - ubifs_release_budget(c, &ino_req); kfree(dev); - return err; + goto out_release; } whiteout->i_state |= I_LINKABLE; @@ -1483,12 +1480,10 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry, err = ubifs_budget_space(c, &wht_req); if (err) { - ubifs_release_budget(c, &req); - ubifs_release_budget(c, &ino_req); kfree(whiteout_ui->data); whiteout_ui->data_len = 0; iput(whiteout); - return err; + goto out_release; } inc_nlink(whiteout); @@ -1543,6 +1538,7 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry, iput(whiteout); } unlock_4_inodes(old_dir, new_dir, new_inode, whiteout); +out_release: ubifs_release_budget(c, &ino_req); ubifs_release_budget(c, &req); fscrypt_free_filename(&old_nm); -- 1.9.1