shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 19:08:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

ksmbd: Change the return value of ksmbd_vfs_query_maximal_access to void

Browse Source 
[ Upstream commit ccb5889af9 ]

The return value of ksmbd_vfs_query_maximal_access is meaningless,
it is better to modify it to void.

Signed-off-by: Lu Hongfei <luhongfei@vivo.com>
Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Lu Hongfei
2023-12-19 00:34:07 +09:00
committed by Greg Kroah-Hartman
parent 7585898ddf
commit 638043bef9
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/ksmbd/smb2pdu.c
View File

@@ -2877,11 +2877,9 @@ int smb2_open(struct ksmbd_work *work)
if (!file_present) { if (!file_present) {
daccess = cpu_to_le32(GENERIC_ALL_FLAGS); daccess = cpu_to_le32(GENERIC_ALL_FLAGS);
} else { } else {
rc = ksmbd_vfs_query_maximal_access(user_ns, ksmbd_vfs_query_maximal_access(user_ns,
path.dentry, path.dentry,
&daccess); &daccess);
if (rc)
goto err_out;
already_permitted = true; already_permitted = true;
} }
maximal_access = daccess; maximal_access = daccess;

6
fs/ksmbd/vfs.c
View File

@@ -121,11 +121,9 @@ err_out:
return -ENOENT; return -ENOENT;
} }
int ksmbd_vfs_query_maximal_access(struct user_namespace *user_ns, void ksmbd_vfs_query_maximal_access(struct user_namespace *user_ns,
struct dentry *dentry, __le32 *daccess) struct dentry *dentry, __le32 *daccess)
{ {
int ret = 0;
*daccess = cpu_to_le32(FILE_READ_ATTRIBUTES | READ_CONTROL); *daccess = cpu_to_le32(FILE_READ_ATTRIBUTES | READ_CONTROL);
if (!inode_permission(user_ns, d_inode(dentry), MAY_OPEN | MAY_WRITE)) if (!inode_permission(user_ns, d_inode(dentry), MAY_OPEN | MAY_WRITE))
@@ -142,8 +140,6 @@ int ksmbd_vfs_query_maximal_access(struct user_namespace *user_ns,
if (!inode_permission(user_ns, d_inode(dentry->d_parent), MAY_EXEC | MAY_WRITE)) if (!inode_permission(user_ns, d_inode(dentry->d_parent), MAY_EXEC | MAY_WRITE))
*daccess |= FILE_DELETE_LE; *daccess |= FILE_DELETE_LE;
return ret;
} }
/** /**

2
fs/ksmbd/vfs.h
View File

@@ -111,7 +111,7 @@ struct ksmbd_kstat {
}; };
int ksmbd_vfs_lock_parent(struct dentry *parent, struct dentry *child); int ksmbd_vfs_lock_parent(struct dentry *parent, struct dentry *child);
int ksmbd_vfs_query_maximal_access(struct user_namespace *user_ns, void ksmbd_vfs_query_maximal_access(struct user_namespace *user_ns,
struct dentry *dentry, __le32 *daccess); struct dentry *dentry, __le32 *daccess);
int ksmbd_vfs_create(struct ksmbd_work *work, const char *name, umode_t mode); int ksmbd_vfs_create(struct ksmbd_work *work, const char *name, umode_t mode);
int ksmbd_vfs_mkdir(struct ksmbd_work *work, const char *name, umode_t mode); int ksmbd_vfs_mkdir(struct ksmbd_work *work, const char *name, umode_t mode);