ksmbd: change security id to the one samba used for posix extension

[ Upstream commit 5609bdd9ffdccd83f9003511b1801584b703baa5 ]

Samba set SIDOWNER and SIDUNIX_GROUP in create posix context and
set SIDUNIX_USER/GROUP in other sids for posix extension.
This patch change security id to the one samba used.

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>

diff --git a/fs/ksmbd/oplock.c b/fs/ksmbd/oplock.c
index b527f451d7a4644fe437aa71a346dd7fe4511cc7..c2a19328f01d9ff4bf39ff7394e3b716a251c25c 100644 (file)
--- a/fs/ksmbd/oplock.c
+++ b/fs/ksmbd/oplock.c
@@ -1615,7 +1615,11 @@ void create_posix_rsp_buf(char *cc, struct ksmbd_file *fp)
        memset(buf, 0, sizeof(struct create_posix_rsp));
        buf->ccontext.DataOffset = cpu_to_le16(offsetof
                        (struct create_posix_rsp, nlink));
-       buf->ccontext.DataLength = cpu_to_le32(52);
+       /*
+        * DataLength = nlink(4) + reparse_tag(4) + mode(4) +
+        * domain sid(28) + unix group sid(16).
+        */
+       buf->ccontext.DataLength = cpu_to_le32(56);
        buf->ccontext.NameOffset = cpu_to_le16(offsetof
                        (struct create_posix_rsp, Name));
        buf->ccontext.NameLength = cpu_to_le16(POSIX_CTXT_DATA_LEN);
@@ -1640,12 +1644,19 @@ 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);
+       /*
+        * SidBuffer(44) contain two sids(Domain sid(28), UNIX group sid(16)).
+        * Domain sid(28) = revision(1) + num_subauth(1) + authority(6) +
+        *                  sub_auth(4 * 4(num_subauth)) + RID(4).
+        * UNIX group id(16) = revision(1) + num_subauth(1) + authority(6) +
+        *                     sub_auth(4 * 1(num_subauth)) + RID(4).
+        */
        id_to_sid(from_kuid_munged(&init_user_ns,
                                   i_uid_into_mnt(user_ns, inode)),
-                 SIDNFS_USER, (struct smb_sid *)&buf->SidBuffer[0]);
+                 SIDOWNER, (struct smb_sid *)&buf->SidBuffer[0]);
        id_to_sid(from_kgid_munged(&init_user_ns,
                                   i_gid_into_mnt(user_ns, inode)),
-                 SIDNFS_GROUP, (struct smb_sid *)&buf->SidBuffer[20]);
+                 SIDUNIX_GROUP, (struct smb_sid *)&buf->SidBuffer[28]);
 }
 
 /*

diff --git a/fs/ksmbd/smb2pdu.c b/fs/ksmbd/smb2pdu.c
index ee5a1e9c65805902241e32c4317a922f883657f6..ab6fe679aad52e9b37a7daae24b6f4fdffeb6303 100644 (file)
--- a/fs/ksmbd/smb2pdu.c
+++ b/fs/ksmbd/smb2pdu.c
@@ -3619,10 +3619,15 @@ static int smb2_populate_readdir_entry(struct ksmbd_conn *conn, int info_level,
                        S_ISDIR(ksmbd_kstat->kstat->mode) ? ATTR_DIRECTORY_LE : ATTR_ARCHIVE_LE;
                if (d_info->hide_dot_file && d_info->name[0] == '.')
                        posix_info->DosAttributes |= ATTR_HIDDEN_LE;
+               /*
+                * SidBuffer(32) contain two sids(Domain sid(16), UNIX group sid(16)).
+                * UNIX sid(16) = revision(1) + num_subauth(1) + authority(6) +
+                *                sub_auth(4 * 1(num_subauth)) + RID(4).
+                */
                id_to_sid(from_kuid_munged(&init_user_ns, ksmbd_kstat->kstat->uid),
-                         SIDNFS_USER, (struct smb_sid *)&posix_info->SidBuffer[0]);
+                         SIDUNIX_USER, (struct smb_sid *)&posix_info->SidBuffer[0]);
                id_to_sid(from_kgid_munged(&init_user_ns, ksmbd_kstat->kstat->gid),
-                         SIDNFS_GROUP, (struct smb_sid *)&posix_info->SidBuffer[20]);
+                         SIDUNIX_GROUP, (struct smb_sid *)&posix_info->SidBuffer[16]);
                memcpy(posix_info->name, conv_name, conv_len);
                posix_info->name_len = cpu_to_le32(conv_len);
                posix_info->NextEntryOffset = cpu_to_le32(next_entry_offset);

diff --git a/fs/ksmbd/smb2pdu.h b/fs/ksmbd/smb2pdu.h
index 10776df5baa737d825e4b2a1b741aad9c5f79e6f..fe391b8afa9c989a83a78150559e5fbcbc856620 100644 (file)
--- a/fs/ksmbd/smb2pdu.h
+++ b/fs/ksmbd/smb2pdu.h
@@ -724,7 +724,8 @@ struct create_posix_rsp {
        __le32 nlink;
        __le32 reparse_tag;
        __le32 mode;
-       u8 SidBuffer[40];
+       /* SidBuffer contain two sids(Domain sid(28), UNIX group sid(16)) */
+       u8 SidBuffer[44];
 } __packed;
 
 #define SMB2_LEASE_NONE_LE                     cpu_to_le32(0x00)
@@ -1617,7 +1618,8 @@ struct smb2_posix_info {
        __le32 HardLinks;
        __le32 ReparseTag;
        __le32 Mode;
-       u8 SidBuffer[40];
+       /* SidBuffer contain two sids (UNIX user sid(16), UNIX group sid(16)) */
+       u8 SidBuffer[32];
        __le32 name_len;
        u8 name[1];
        /*