| Message ID | 1494979082-19414-1-git-send-email-cheol.lee@lge.com |
|---|---|
| State | Accepted |
| Delegated to: | Richard Weinberger |
| Headers | show |
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
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);
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(-)