* [PATCH 2/2] ubifs: Fix memory leak in RENAME_WHITEOUT error path in do_rename
@ 2017-05-16 23:58 Hyunchul Lee
2017-05-17 7:01 ` Richard Weinberger
0 siblings, 1 reply; 2+ messages in thread
From: Hyunchul Lee @ 2017-05-16 23:58 UTC (permalink / raw)
To: Richard Weinberger
Cc: Artem Bityutskiy, adrian.hunter, linux-kernel, linux-fsdevel,
linux-mtd, kernel-team
in RENAME_WHITEOUT error path, fscrypt_name should be freed.
Signed-off-by: Hyunchul Lee <cheol.lee@lge.com>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 2/2] ubifs: Fix memory leak in RENAME_WHITEOUT error path in do_rename
2017-05-16 23:58 [PATCH 2/2] ubifs: Fix memory leak in RENAME_WHITEOUT error path in do_rename Hyunchul Lee
@ 2017-05-17 7:01 ` Richard Weinberger
0 siblings, 0 replies; 2+ messages in thread
From: Richard Weinberger @ 2017-05-17 7:01 UTC (permalink / raw)
To: Hyunchul Lee
Cc: Artem Bityutskiy, adrian.hunter, linux-kernel, linux-fsdevel,
linux-mtd, kernel-team
Hyunchul,
Am 17.05.2017 um 01:58 schrieb Hyunchul Lee:
> in RENAME_WHITEOUT error path, fscrypt_name should be freed.
>
> Signed-off-by: Hyunchul Lee <cheol.lee@lge.com>
> ---
> 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);
>
Good find too. :-)
This function needs a cleanup, it is much longer than it should be.
Thanks,
//richard
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-05-17 7:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-16 23:58 [PATCH 2/2] ubifs: Fix memory leak in RENAME_WHITEOUT error path in do_rename Hyunchul Lee
2017-05-17 7:01 ` Richard Weinberger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).