ksmbd: fix `force create mode' and `force directory mode'
Subsystems (2)
PATCH 1/1 ksmbd: fix `force create mode' and `force directory mode'
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ä <[email protected]>
--- fs/smb/server/mgmt/share_config.h | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-)
fs/smb/server/mgmt/share_config.h +11 -18
@@ -34,29 +34,22 @@ struct ksmbd_share_config {#define KSMBD_SHARE_INVALID_UID ((__u16)-1)#define KSMBD_SHARE_INVALID_GID ((__u16)-1) -static inline int share_config_create_mode (struct ksmbd_share_config *share, -umode_t posix_mode) +static inline umode_t +share_config_create_mode (struct ksmbd_share_config *share, +umode_t posix_mode) { -if (!share->force_create_mode) { -if (!posix_mode) -return share->create_mask; -else -return posix_mode & share->create_mask; - } -return share->force_create_mode & share->create_mask; +umode_t mode = (posix_mode ?: (umode_t)-1 ) & share->create_mask; + +return mode | share->force_create_mode; } -static inline int share_config_directory_mode (struct ksmbd_share_config *share, -umode_t posix_mode) +static inline umode_t +share_config_directory_mode (struct ksmbd_share_config *share, +umode_t posix_mode) { -if (!share->force_directory_mode) { -if (!posix_mode) -return share->directory_mask; -else -return posix_mode & share->directory_mask; - } +umode_t mode = (posix_mode ?: (umode_t)-1 ) & 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,
Signature · 1 line
2.41.0
2023-08-11 5:01 GMT+09:00, Atte Heikkilä <[email protected]>:
Quoted 5 lines
force create mode' andforce directory mode' should be bitwise ORed with the perms aftercreate mask' anddirectory mask' have been applied, respectively.Signed-off-by Atte Heikkilä <[email protected]>
Acked-by Namjae Jeon <[email protected]>
Thanks for your patch!