Commit 25933573 authored May 30, 2023 by Namjae Jeon Committed by Steve French Jun 02, 2023

ksmbd: fix posix_acls and acls dereferencing possible ERR_PTR()



Dan reported the following error message:

fs/smb/server/smbacl.c:1296 smb_check_perm_dacl()
    error: 'posix_acls' dereferencing possible ERR_PTR()
fs/smb/server/vfs.c:1323 ksmbd_vfs_make_xattr_posix_acl()
    error: 'posix_acls' dereferencing possible ERR_PTR()
fs/smb/server/vfs.c:1830 ksmbd_vfs_inherit_posix_acl()
    error: 'acls' dereferencing possible ERR_PTR()

__get_acl() returns a mix of error pointers and NULL. This change it
with IS_ERR_OR_NULL().

Fixes: e2f34481 ("cifsd: add server-side procedures for SMB3")
Cc: stable@vger.kernel.org
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>

parent fc6c6a3c

fs/smb/server/smbacl.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1290,7 +1290,7 @@ int smb_check_perm_dacl(struct ksmbd_conn conn, const struct path path,

		if (IS_ENABLED(CONFIG_FS_POSIX_ACL)) {
		posix_acls = get_inode_acl(d_inode(path->dentry), ACL_TYPE_ACCESS);
		if (posix_acls && !found) {
		if (!IS_ERR_OR_NULL(posix_acls) && !found) {
		unsigned int id = -1;

		pa_entry = posix_acls->a_entries;
		@@ -1314,7 +1314,7 @@ int smb_check_perm_dacl(struct ksmbd_conn conn, const struct path path,
		}
		}
		}
		if (posix_acls)
		if (!IS_ERR_OR_NULL(posix_acls))
		posix_acl_release(posix_acls);
		}

fs/smb/server/vfs.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1321,7 +1321,7 @@ static struct xattr_smb_acl ksmbd_vfs_make_xattr_posix_acl(struct mnt_idmap id
		return NULL;

		posix_acls = get_inode_acl(inode, acl_type);
		if (!posix_acls)
		if (IS_ERR_OR_NULL(posix_acls))
		return NULL;

		smb_acl = kzalloc(sizeof(struct xattr_smb_acl) +
		@@ -1830,7 +1830,7 @@ int ksmbd_vfs_inherit_posix_acl(struct mnt_idmap *idmap,
		return -EOPNOTSUPP;

		acls = get_inode_acl(parent_inode, ACL_TYPE_DEFAULT);
		if (!acls)
		if (IS_ERR_OR_NULL(acls))
		return -ENOENT;
		pace = acls->a_entries;