Commit d54d612a authored Nov 21, 2018 by Tiezhu Yang Committed by Greg Kroah-Hartman Feb 12, 2019

f2fs: fix wrong return value of f2fs_acl_create



[ Upstream commit f6176473a0c7472380eef72ebeb330cf9485bf0a ]

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 beaf226b
("posix_acl: don't ignore return value of posix_acl_create_masq()").

Fixes: 83dfe53c ("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>

parent ddab3d0a

fs/f2fs/acl.c

+8 −6

Original line number	Diff line number	Diff line
		@@ -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);
		@@ -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,