Skip to content

Commit

Permalink
f2fs: fix wrong return value of f2fs_acl_create
Browse files Browse the repository at this point in the history
When call f2fs_acl_create_masq() failed, the caller f2fs_acl_create()
should return -EIO instead of -ENOMEM, this patch makes it consistent
with posix_acl_create() which has been fixed in commit beaf226
("posix_acl: don't ignore return value of posix_acl_create_masq()").

Fixes: 83dfe53 ("f2fs: fix reference leaks in f2fs_acl_create")
Signed-off-by: Tiezhu Yang <kernelpatch@126.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
  • Loading branch information
Tiezhu Yang authored and Jaegeuk Kim committed Nov 26, 2018
1 parent f5d5510 commit f617647
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions fs/f2fs/acl.c
Original file line number Diff line number Diff line change
Expand Up @@ -352,12 +352,14 @@ static int f2fs_acl_create(struct inode *dir, umode_t *mode,
return PTR_ERR(p);

clone = f2fs_acl_clone(p, GFP_NOFS);
if (!clone)
goto no_mem;
if (!clone) {
ret = -ENOMEM;
goto release_acl;
}

ret = f2fs_acl_create_masq(clone, mode);
if (ret < 0)
goto no_mem_clone;
goto release_clone;

if (ret == 0)
posix_acl_release(clone);
Expand All @@ -371,11 +373,11 @@ static int f2fs_acl_create(struct inode *dir, umode_t *mode,

return 0;

no_mem_clone:
release_clone:
posix_acl_release(clone);
no_mem:
release_acl:
posix_acl_release(p);
return -ENOMEM;
return ret;
}

int f2fs_init_acl(struct inode *inode, struct inode *dir, struct page *ipage,
Expand Down

0 comments on commit f617647

Please sign in to comment.