korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-01 08:04:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

cifs: modefromsid: write mode ACE first

Browse Source 
DACL should start with mode ACE first but we are putting it at the
end. reorder them to put it first.

Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
This commit is contained in:
Aurelien Aptel 2019-09-17 01:47:27 +02:00 committed by Steve French
parent 352f2c9a57
commit e37a02c7eb
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
fs/cifs/cifsacl.c
View File

@ -809,30 +809,21 @@ static int set_chmod_dacl(struct cifs_acl *pndacl, struct cifs_sid *pownersid,
struct cifs_sid *pgrpsid, __u64 nmode, bool modefromsid) struct cifs_sid *pgrpsid, __u64 nmode, bool modefromsid)
{ {
u16 size = 0; u16 size = 0;
u32 num_aces = 0;
struct cifs_acl *pnndacl; struct cifs_acl *pnndacl;
pnndacl = (struct cifs_acl *)((char *)pndacl + sizeof(struct cifs_acl)); pnndacl = (struct cifs_acl *)((char *)pndacl + sizeof(struct cifs_acl));
size += fill_ace_for_sid((struct cifs_ace *) ((char *)pnndacl + size),
pownersid, nmode, S_IRWXU);
size += fill_ace_for_sid((struct cifs_ace *)((char *)pnndacl + size),
pgrpsid, nmode, S_IRWXG);
size += fill_ace_for_sid((struct cifs_ace *)((char *)pnndacl + size),
&sid_everyone, nmode, S_IRWXO);
/* TBD: Move this ACE to the top of ACE list instead of bottom */
if (modefromsid) { if (modefromsid) {
struct cifs_ace *pntace = struct cifs_ace *pntace =
(struct cifs_ace *)((char *)pnndacl + size); (struct cifs_ace *)((char *)pnndacl + size);
int i; int i;
pntace->type = ACCESS_DENIED; pntace->type = ACCESS_ALLOWED;
pntace->flags = 0x0; pntace->flags = 0x0;
pntace->access_req = 0;
pntace->sid.num_subauth = 3; pntace->sid.num_subauth = 3;
pntace->sid.revision = 1; pntace->sid.revision = 1;
/* size = 1 + 1 + 2 + 4 + 1 + 1 + 6 + (psid->num_subauth * 4) */
pntace->size = cpu_to_le16(28);
size += 28;
for (i = 0; i < NUM_AUTHS; i++) for (i = 0; i < NUM_AUTHS; i++)
pntace->sid.authority[i] = pntace->sid.authority[i] =
sid_unix_NFS_mode.authority[i]; sid_unix_NFS_mode.authority[i];
@ -840,12 +831,23 @@ static int set_chmod_dacl(struct cifs_acl *pndacl, struct cifs_sid *pownersid,
pntace->sid.sub_auth[1] = sid_unix_NFS_mode.sub_auth[1]; pntace->sid.sub_auth[1] = sid_unix_NFS_mode.sub_auth[1];
pntace->sid.sub_auth[2] = cpu_to_le32(nmode & 07777); pntace->sid.sub_auth[2] = cpu_to_le32(nmode & 07777);
pndacl->num_aces = cpu_to_le32(4); /* size = 1 + 1 + 2 + 4 + 1 + 1 + 6 + (psid->num_subauth*4) */
size += fill_ace_for_sid((struct cifs_ace *)((char *)pnndacl + size), pntace->size = cpu_to_le16(28);
&sid_unix_NFS_mode, nmode, S_IRWXO); size += 28;
} else num_aces++;
pndacl->num_aces = cpu_to_le32(3); }
size += fill_ace_for_sid((struct cifs_ace *) ((char *)pnndacl + size),
pownersid, nmode, S_IRWXU);
num_aces++;
size += fill_ace_for_sid((struct cifs_ace *)((char *)pnndacl + size),
pgrpsid, nmode, S_IRWXG);
num_aces++;
size += fill_ace_for_sid((struct cifs_ace *)((char *)pnndacl + size),
&sid_everyone, nmode, S_IRWXO);
num_aces++;
pndacl->num_aces = cpu_to_le32(num_aces);
pndacl->size = cpu_to_le16(size + sizeof(struct cifs_acl)); pndacl->size = cpu_to_le16(size + sizeof(struct cifs_acl));
return 0; return 0;