]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ksmbd: set file permission mode to match Samba server posix extension behavior
authorNamjae Jeon <linkinjeon@kernel.org>
Mon, 18 Dec 2023 15:33:14 +0000 (00:33 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 23 Dec 2023 09:41:52 +0000 (10:41 +0100)
[ Upstream commit f6c2b201da7588f7f7688ddc99b7bb000609129c ]

Set file permission mode to match Samba server posix extension behavior.

Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/ksmbd/oplock.c
fs/ksmbd/smb2pdu.c

index c2a19328f01d9ff4bf39ff7394e3b716a251c25c..919c598a9d6689ec1a43139b27c3be29c7599c67 100644 (file)
@@ -1643,7 +1643,7 @@ void create_posix_rsp_buf(char *cc, struct ksmbd_file *fp)
 
        buf->nlink = cpu_to_le32(inode->i_nlink);
        buf->reparse_tag = cpu_to_le32(fp->volatile_id);
-       buf->mode = cpu_to_le32(inode->i_mode);
+       buf->mode = cpu_to_le32(inode->i_mode & 0777);
        /*
         * SidBuffer(44) contain two sids(Domain sid(28), UNIX group sid(16)).
         * Domain sid(28) = revision(1) + num_subauth(1) + authority(6) +
index ab6fe679aad52e9b37a7daae24b6f4fdffeb6303..96e3bb9012b9bb222421e40ae05597605c461ee4 100644 (file)
@@ -3613,7 +3613,7 @@ static int smb2_populate_readdir_entry(struct ksmbd_conn *conn, int info_level,
                posix_info->AllocationSize = cpu_to_le64(ksmbd_kstat->kstat->blocks << 9);
                posix_info->DeviceId = cpu_to_le32(ksmbd_kstat->kstat->rdev);
                posix_info->HardLinks = cpu_to_le32(ksmbd_kstat->kstat->nlink);
-               posix_info->Mode = cpu_to_le32(ksmbd_kstat->kstat->mode);
+               posix_info->Mode = cpu_to_le32(ksmbd_kstat->kstat->mode & 0777);
                posix_info->Inode = cpu_to_le64(ksmbd_kstat->kstat->ino);
                posix_info->DosAttributes =
                        S_ISDIR(ksmbd_kstat->kstat->mode) ? ATTR_DIRECTORY_LE : ATTR_ARCHIVE_LE;
@@ -4769,7 +4769,7 @@ static int find_file_posix_info(struct smb2_query_info_rsp *rsp,
        file_info->EndOfFile = cpu_to_le64(inode->i_size);
        file_info->AllocationSize = cpu_to_le64(inode->i_blocks << 9);
        file_info->HardLinks = cpu_to_le32(inode->i_nlink);
-       file_info->Mode = cpu_to_le32(inode->i_mode);
+       file_info->Mode = cpu_to_le32(inode->i_mode & 0777);
        file_info->DeviceId = cpu_to_le32(inode->i_rdev);
        rsp->OutputBufferLength =
                cpu_to_le32(sizeof(struct smb311_posix_qinfo));