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

ksmbd: fix force create mode' and force directory mode'

Browse Source 
[ Upstream commit 65656f5242 ]

`force create mode' and `force directory mode' should be bitwise ORed
with the perms after `create mask' and `directory mask' have been
applied, respectively.

Signed-off-by: Atte Heikkilä <atteh.mailbox@gmail.com>
Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Atte Heikkilä
2023-12-31 16:12:56 +09:00
committed by Greg Kroah-Hartman
parent f8cf1ebb7d
commit c20105a897
1 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
fs/smb/server/mgmt/share_config.h
View File

@@ -34,29 +34,22 @@ struct ksmbd_share_config {
#define KSMBD_SHARE_INVALID_UID ((__u16)-1) #define KSMBD_SHARE_INVALID_UID ((__u16)-1)
#define KSMBD_SHARE_INVALID_GID ((__u16)-1) #define KSMBD_SHARE_INVALID_GID ((__u16)-1)
static inline int share_config_create_mode(struct ksmbd_share_config *share, static inline umode_t
umode_t posix_mode) share_config_create_mode(struct ksmbd_share_config *share,
umode_t posix_mode)
{ {
if (!share->force_create_mode) { umode_t mode = (posix_mode ?: (umode_t)-1) & share->create_mask;
if (!posix_mode)
return share->create_mask; return mode | share->force_create_mode;
else
return posix_mode & share->create_mask;
}
return share->force_create_mode & share->create_mask;
} }
static inline int share_config_directory_mode(struct ksmbd_share_config *share, static inline umode_t
umode_t posix_mode) share_config_directory_mode(struct ksmbd_share_config *share,
umode_t posix_mode)
{ {
if (!share->force_directory_mode) { umode_t mode = (posix_mode ?: (umode_t)-1) & share->directory_mask;
if (!posix_mode)
return share->directory_mask;
else
return posix_mode & share->directory_mask;
}
return share->force_directory_mode & share->directory_mask; return mode | share->force_directory_mode;
} }
static inline int test_share_config_flag(struct ksmbd_share_config *share, static inline int test_share_config_flag(struct ksmbd_share_config *share,