mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 06:10:56 +00:00
f2fs: fix wrong return value of f2fs_acl_create
[ Upstream commitf6176473a0
] 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 commitbeaf226b86
("posix_acl: don't ignore return value of posix_acl_create_masq()"). Fixes:83dfe53c18
("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> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
58282978fe
commit
c357fe55e4
1 changed files with 8 additions and 6 deletions
|
@ -349,12 +349,14 @@ static int f2fs_acl_create(struct inode *dir, umode_t *mode,
|
||||||
return PTR_ERR(p);
|
return PTR_ERR(p);
|
||||||
|
|
||||||
clone = f2fs_acl_clone(p, GFP_NOFS);
|
clone = f2fs_acl_clone(p, GFP_NOFS);
|
||||||
if (!clone)
|
if (!clone) {
|
||||||
goto no_mem;
|
ret = -ENOMEM;
|
||||||
|
goto release_acl;
|
||||||
|
}
|
||||||
|
|
||||||
ret = f2fs_acl_create_masq(clone, mode);
|
ret = f2fs_acl_create_masq(clone, mode);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto no_mem_clone;
|
goto release_clone;
|
||||||
|
|
||||||
if (ret == 0)
|
if (ret == 0)
|
||||||
posix_acl_release(clone);
|
posix_acl_release(clone);
|
||||||
|
@ -368,11 +370,11 @@ static int f2fs_acl_create(struct inode *dir, umode_t *mode,
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
no_mem_clone:
|
release_clone:
|
||||||
posix_acl_release(clone);
|
posix_acl_release(clone);
|
||||||
no_mem:
|
release_acl:
|
||||||
posix_acl_release(p);
|
posix_acl_release(p);
|
||||||
return -ENOMEM;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
int f2fs_init_acl(struct inode *inode, struct inode *dir, struct page *ipage,
|
int f2fs_init_acl(struct inode *inode, struct inode *dir, struct page *ipage,
|
||||||
|
|
Loading…
Reference in a new issue