github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-01 19:13:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

smb: common: change the data type of num_aces to le16

Browse Source 
2.4.5 in [MS-DTYP].pdf describe the data type of num_aces as le16.

AceCount (2 bytes): An unsigned 16-bit integer that specifies the count
of the number of ACE records in the ACL.

Change it to le16 and add reserved field to smb_acl struct.

Reported-by: Igor Leite Ladessa <igor-ladessa@hotmail.com>
Tested-by: Igor Leite Ladessa <igor-ladessa@hotmail.com>
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
This commit is contained in:
Namjae Jeon 2025-02-12 23:26:09 +09:00 committed by Steve French
parent e26e2d2e15
commit 62e7dd0a39
4 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fs/smb/client/cifsacl.c
View File

@ -763,7 +763,7 @@ static void parse_dacl(struct smb_acl *pdacl, char *end_of_acl,
struct cifs_fattr *fattr, bool mode_from_special_sid) struct cifs_fattr *fattr, bool mode_from_special_sid)
{ {
int i; int i;
int num_aces = 0; u16 num_aces = 0;
int acl_size; int acl_size;
char *acl_base; char *acl_base;
struct smb_ace **ppace; struct smb_ace **ppace;
@ -785,7 +785,7 @@ static void parse_dacl(struct smb_acl *pdacl, char *end_of_acl,
cifs_dbg(NOISY, "DACL revision %d size %d num aces %d\n", cifs_dbg(NOISY, "DACL revision %d size %d num aces %d\n",
le16_to_cpu(pdacl->revision), le16_to_cpu(pdacl->size), le16_to_cpu(pdacl->revision), le16_to_cpu(pdacl->size),
le32_to_cpu(pdacl->num_aces)); le16_to_cpu(pdacl->num_aces));
/* reset rwx permissions for user/group/other. /* reset rwx permissions for user/group/other.
Also, if num_aces is 0 i.e. DACL has no ACEs, Also, if num_aces is 0 i.e. DACL has no ACEs,
@ -795,7 +795,7 @@ static void parse_dacl(struct smb_acl *pdacl, char *end_of_acl,
acl_base = (char *)pdacl; acl_base = (char *)pdacl;
acl_size = sizeof(struct smb_acl); acl_size = sizeof(struct smb_acl);
num_aces = le32_to_cpu(pdacl->num_aces); num_aces = le16_to_cpu(pdacl->num_aces);
if (num_aces > 0) { if (num_aces > 0) {
umode_t denied_mode = 0; umode_t denied_mode = 0;
@ -937,12 +937,12 @@ unsigned int setup_special_user_owner_ACE(struct smb_ace *pntace)
static void populate_new_aces(char *nacl_base, static void populate_new_aces(char *nacl_base,
struct smb_sid *pownersid, struct smb_sid *pownersid,
struct smb_sid *pgrpsid, struct smb_sid *pgrpsid,
__u64 *pnmode, u32 *pnum_aces, u16 *pnsize, __u64 *pnmode, u16 *pnum_aces, u16 *pnsize,
bool modefromsid, bool modefromsid,
bool posix) bool posix)
{ {
__u64 nmode; __u64 nmode;
u32 num_aces = 0; u16 num_aces = 0;
u16 nsize = 0; u16 nsize = 0;
__u64 user_mode; __u64 user_mode;
__u64 group_mode; __u64 group_mode;
@ -1050,7 +1050,7 @@ static __u16 replace_sids_and_copy_aces(struct smb_acl *pdacl, struct smb_acl *p
u16 size = 0; u16 size = 0;
struct smb_ace *pntace = NULL; struct smb_ace *pntace = NULL;
char *acl_base = NULL; char *acl_base = NULL;
u32 src_num_aces = 0; u16 src_num_aces = 0;
u16 nsize = 0; u16 nsize = 0;
struct smb_ace *pnntace = NULL; struct smb_ace *pnntace = NULL;
char *nacl_base = NULL; char *nacl_base = NULL;
@ -1058,7 +1058,7 @@ static __u16 replace_sids_and_copy_aces(struct smb_acl *pdacl, struct smb_acl *p
acl_base = (char *)pdacl; acl_base = (char *)pdacl;
size = sizeof(struct smb_acl); size = sizeof(struct smb_acl);
src_num_aces = le32_to_cpu(pdacl->num_aces); src_num_aces = le16_to_cpu(pdacl->num_aces);
nacl_base = (char *)pndacl; nacl_base = (char *)pndacl;
nsize = sizeof(struct smb_acl); nsize = sizeof(struct smb_acl);
@ -1090,11 +1090,11 @@ static int set_chmod_dacl(struct smb_acl *pdacl, struct smb_acl *pndacl,
u16 size = 0; u16 size = 0;
struct smb_ace *pntace = NULL; struct smb_ace *pntace = NULL;
char *acl_base = NULL; char *acl_base = NULL;
u32 src_num_aces = 0; u16 src_num_aces = 0;
u16 nsize = 0; u16 nsize = 0;
struct smb_ace *pnntace = NULL; struct smb_ace *pnntace = NULL;
char *nacl_base = NULL; char *nacl_base = NULL;
u32 num_aces = 0; u16 num_aces = 0;
bool new_aces_set = false; bool new_aces_set = false;
/* Assuming that pndacl and pnmode are never NULL */ /* Assuming that pndacl and pnmode are never NULL */
@ -1112,7 +1112,7 @@ static int set_chmod_dacl(struct smb_acl *pdacl, struct smb_acl *pndacl,
acl_base = (char *)pdacl; acl_base = (char *)pdacl;
size = sizeof(struct smb_acl); size = sizeof(struct smb_acl);
src_num_aces = le32_to_cpu(pdacl->num_aces); src_num_aces = le16_to_cpu(pdacl->num_aces);
/* Retain old ACEs which we can retain */ /* Retain old ACEs which we can retain */
for (i = 0; i < src_num_aces; ++i) { for (i = 0; i < src_num_aces; ++i) {
@ -1158,7 +1158,7 @@ static int set_chmod_dacl(struct smb_acl *pdacl, struct smb_acl *pndacl,
} }
finalize_dacl: finalize_dacl:
pndacl->num_aces = cpu_to_le32(num_aces); pndacl->num_aces = cpu_to_le16(num_aces);
pndacl->size = cpu_to_le16(nsize); pndacl->size = cpu_to_le16(nsize);
return 0; return 0;
@ -1293,7 +1293,7 @@ static int build_sec_desc(struct smb_ntsd *pntsd, struct smb_ntsd *pnntsd,
dacloffset ? dacl_ptr->revision : cpu_to_le16(ACL_REVISION); dacloffset ? dacl_ptr->revision : cpu_to_le16(ACL_REVISION);
ndacl_ptr->size = cpu_to_le16(0); ndacl_ptr->size = cpu_to_le16(0);
ndacl_ptr->num_aces = cpu_to_le32(0); ndacl_ptr->num_aces = cpu_to_le16(0);
rc = set_chmod_dacl(dacl_ptr, ndacl_ptr, owner_sid_ptr, group_sid_ptr, rc = set_chmod_dacl(dacl_ptr, ndacl_ptr, owner_sid_ptr, group_sid_ptr,
pnmode, mode_from_sid, posix); pnmode, mode_from_sid, posix);
@ -1653,7 +1653,7 @@ id_mode_to_cifs_acl(struct inode *inode, const char *path, __u64 *pnmode,
dacl_ptr = (struct smb_acl *)((char *)pntsd + dacloffset); dacl_ptr = (struct smb_acl *)((char *)pntsd + dacloffset);
if (mode_from_sid) if (mode_from_sid)
nsecdesclen += nsecdesclen +=
le32_to_cpu(dacl_ptr->num_aces) * sizeof(struct smb_ace); le16_to_cpu(dacl_ptr->num_aces) * sizeof(struct smb_ace);
else /* cifsacl */ else /* cifsacl */
nsecdesclen += le16_to_cpu(dacl_ptr->size); nsecdesclen += le16_to_cpu(dacl_ptr->size);
} }

3
fs/smb/common/smbacl.h
View File

@ -107,7 +107,8 @@ struct smb_sid {
struct smb_acl { struct smb_acl {
__le16 revision; /* revision level */ __le16 revision; /* revision level */
__le16 size; __le16 size;
__le32 num_aces; __le16 num_aces;
__le16 reserved;
} __attribute__((packed)); } __attribute__((packed));
struct smb_ace { struct smb_ace {

31
fs/smb/server/smbacl.c
View File

@ -333,7 +333,7 @@ void posix_state_to_acl(struct posix_acl_state *state,
pace->e_perm = state->other.allow; pace->e_perm = state->other.allow;
} }
int init_acl_state(struct posix_acl_state *state, int cnt) int init_acl_state(struct posix_acl_state *state, u16 cnt)
{ {
int alloc; int alloc;
@ -368,7 +368,7 @@ static void parse_dacl(struct mnt_idmap *idmap,
struct smb_fattr *fattr) struct smb_fattr *fattr)
{ {
int i, ret; int i, ret;
int num_aces = 0; u16 num_aces = 0;
unsigned int acl_size; unsigned int acl_size;
char *acl_base; char *acl_base;
struct smb_ace **ppace; struct smb_ace **ppace;
@ -389,12 +389,12 @@ static void parse_dacl(struct mnt_idmap *idmap,
ksmbd_debug(SMB, "DACL revision %d size %d num aces %d\n", ksmbd_debug(SMB, "DACL revision %d size %d num aces %d\n",
le16_to_cpu(pdacl->revision), le16_to_cpu(pdacl->size), le16_to_cpu(pdacl->revision), le16_to_cpu(pdacl->size),
le32_to_cpu(pdacl->num_aces)); le16_to_cpu(pdacl->num_aces));
acl_base = (char *)pdacl; acl_base = (char *)pdacl;
acl_size = sizeof(struct smb_acl); acl_size = sizeof(struct smb_acl);
num_aces = le32_to_cpu(pdacl->num_aces); num_aces = le16_to_cpu(pdacl->num_aces);
if (num_aces <= 0) if (num_aces <= 0)
return; return;
@ -580,7 +580,7 @@ static void parse_dacl(struct mnt_idmap *idmap,
static void set_posix_acl_entries_dacl(struct mnt_idmap *idmap, static void set_posix_acl_entries_dacl(struct mnt_idmap *idmap,
struct smb_ace *pndace, struct smb_ace *pndace,
struct smb_fattr *fattr, u32 *num_aces, struct smb_fattr *fattr, u16 *num_aces,
u16 *size, u32 nt_aces_num) u16 *size, u32 nt_aces_num)
{ {
struct posix_acl_entry *pace; struct posix_acl_entry *pace;
@ -701,7 +701,7 @@ static void set_ntacl_dacl(struct mnt_idmap *idmap,
struct smb_fattr *fattr) struct smb_fattr *fattr)
{ {
struct smb_ace *ntace, *pndace; struct smb_ace *ntace, *pndace;
int nt_num_aces = le32_to_cpu(nt_dacl->num_aces), num_aces = 0; u16 nt_num_aces = le16_to_cpu(nt_dacl->num_aces), num_aces = 0;
unsigned short size = 0; unsigned short size = 0;
int i; int i;
@ -728,7 +728,7 @@ static void set_ntacl_dacl(struct mnt_idmap *idmap,
set_posix_acl_entries_dacl(idmap, pndace, fattr, set_posix_acl_entries_dacl(idmap, pndace, fattr,
&num_aces, &size, nt_num_aces); &num_aces, &size, nt_num_aces);
pndacl->num_aces = cpu_to_le32(num_aces); pndacl->num_aces = cpu_to_le16(num_aces);
pndacl->size = cpu_to_le16(le16_to_cpu(pndacl->size) + size); pndacl->size = cpu_to_le16(le16_to_cpu(pndacl->size) + size);
} }
@ -736,7 +736,7 @@ static void set_mode_dacl(struct mnt_idmap *idmap,
struct smb_acl *pndacl, struct smb_fattr *fattr) struct smb_acl *pndacl, struct smb_fattr *fattr)
{ {
struct smb_ace *pace, *pndace; struct smb_ace *pace, *pndace;
u32 num_aces = 0; u16 num_aces = 0;
u16 size = 0, ace_size = 0; u16 size = 0, ace_size = 0;
uid_t uid; uid_t uid;
const struct smb_sid *sid; const struct smb_sid *sid;
@ -792,7 +792,7 @@ static void set_mode_dacl(struct mnt_idmap *idmap,
fattr->cf_mode, 0007); fattr->cf_mode, 0007);
out: out:
pndacl->num_aces = cpu_to_le32(num_aces); pndacl->num_aces = cpu_to_le16(num_aces);
pndacl->size = cpu_to_le16(le16_to_cpu(pndacl->size) + size); pndacl->size = cpu_to_le16(le16_to_cpu(pndacl->size) + size);
} }
@ -1022,8 +1022,9 @@ int smb_inherit_dacl(struct ksmbd_conn *conn,
struct smb_sid owner_sid, group_sid; struct smb_sid owner_sid, group_sid;
struct dentry *parent = path->dentry->d_parent; struct dentry *parent = path->dentry->d_parent;
struct mnt_idmap *idmap = mnt_idmap(path->mnt); struct mnt_idmap *idmap = mnt_idmap(path->mnt);
int inherited_flags = 0, flags = 0, i, ace_cnt = 0, nt_size = 0, pdacl_size; int inherited_flags = 0, flags = 0, i, nt_size = 0, pdacl_size;
int rc = 0, num_aces, dacloffset, pntsd_type, pntsd_size, acl_len, aces_size; int rc = 0, dacloffset, pntsd_type, pntsd_size, acl_len, aces_size;
u16 num_aces, ace_cnt = 0;
char *aces_base; char *aces_base;
bool is_dir = S_ISDIR(d_inode(path->dentry)->i_mode); bool is_dir = S_ISDIR(d_inode(path->dentry)->i_mode);
@ -1039,7 +1040,7 @@ int smb_inherit_dacl(struct ksmbd_conn *conn,
parent_pdacl = (struct smb_acl *)((char *)parent_pntsd + dacloffset); parent_pdacl = (struct smb_acl *)((char *)parent_pntsd + dacloffset);
acl_len = pntsd_size - dacloffset; acl_len = pntsd_size - dacloffset;
num_aces = le32_to_cpu(parent_pdacl->num_aces); num_aces = le16_to_cpu(parent_pdacl->num_aces);
pntsd_type = le16_to_cpu(parent_pntsd->type); pntsd_type = le16_to_cpu(parent_pntsd->type);
pdacl_size = le16_to_cpu(parent_pdacl->size); pdacl_size = le16_to_cpu(parent_pdacl->size);
@ -1199,7 +1200,7 @@ int smb_inherit_dacl(struct ksmbd_conn *conn,
pdacl = (struct smb_acl *)((char *)pntsd + le32_to_cpu(pntsd->dacloffset)); pdacl = (struct smb_acl *)((char *)pntsd + le32_to_cpu(pntsd->dacloffset));
pdacl->revision = cpu_to_le16(2); pdacl->revision = cpu_to_le16(2);
pdacl->size = cpu_to_le16(sizeof(struct smb_acl) + nt_size); pdacl->size = cpu_to_le16(sizeof(struct smb_acl) + nt_size);
pdacl->num_aces = cpu_to_le32(ace_cnt); pdacl->num_aces = cpu_to_le16(ace_cnt);
pace = (struct smb_ace *)((char *)pdacl + sizeof(struct smb_acl)); pace = (struct smb_ace *)((char *)pdacl + sizeof(struct smb_acl));
memcpy(pace, aces_base, nt_size); memcpy(pace, aces_base, nt_size);
pntsd_size += sizeof(struct smb_acl) + nt_size; pntsd_size += sizeof(struct smb_acl) + nt_size;
@ -1280,7 +1281,7 @@ int smb_check_perm_dacl(struct ksmbd_conn *conn, const struct path *path,
ace = (struct smb_ace *)((char *)pdacl + sizeof(struct smb_acl)); ace = (struct smb_ace *)((char *)pdacl + sizeof(struct smb_acl));
aces_size = acl_size - sizeof(struct smb_acl); aces_size = acl_size - sizeof(struct smb_acl);
for (i = 0; i < le32_to_cpu(pdacl->num_aces); i++) { for (i = 0; i < le16_to_cpu(pdacl->num_aces); i++) {
if (offsetof(struct smb_ace, access_req) > aces_size) if (offsetof(struct smb_ace, access_req) > aces_size)
break; break;
ace_size = le16_to_cpu(ace->size); ace_size = le16_to_cpu(ace->size);
@ -1301,7 +1302,7 @@ int smb_check_perm_dacl(struct ksmbd_conn *conn, const struct path *path,
ace = (struct smb_ace *)((char *)pdacl + sizeof(struct smb_acl)); ace = (struct smb_ace *)((char *)pdacl + sizeof(struct smb_acl));
aces_size = acl_size - sizeof(struct smb_acl); aces_size = acl_size - sizeof(struct smb_acl);
for (i = 0; i < le32_to_cpu(pdacl->num_aces); i++) { for (i = 0; i < le16_to_cpu(pdacl->num_aces); i++) {
if (offsetof(struct smb_ace, access_req) > aces_size) if (offsetof(struct smb_ace, access_req) > aces_size)
break; break;
ace_size = le16_to_cpu(ace->size); ace_size = le16_to_cpu(ace->size);

2
fs/smb/server/smbacl.h
View File

@ -86,7 +86,7 @@ int parse_sec_desc(struct mnt_idmap *idmap, struct smb_ntsd *pntsd,
int build_sec_desc(struct mnt_idmap *idmap, struct smb_ntsd *pntsd, int build_sec_desc(struct mnt_idmap *idmap, struct smb_ntsd *pntsd,
struct smb_ntsd *ppntsd, int ppntsd_size, int addition_info, struct smb_ntsd *ppntsd, int ppntsd_size, int addition_info,
__u32 *secdesclen, struct smb_fattr *fattr); __u32 *secdesclen, struct smb_fattr *fattr);
int init_acl_state(struct posix_acl_state *state, int cnt); int init_acl_state(struct posix_acl_state *state, u16 cnt);
void free_acl_state(struct posix_acl_state *state); void free_acl_state(struct posix_acl_state *state);
void posix_state_to_acl(struct posix_acl_state *state, void posix_state_to_acl(struct posix_acl_state *state,
struct posix_acl_entry *pace); struct posix_acl_entry *pace);