aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/cifs/cifsacl.c4
-rw-r--r--fs/cifs/cifsacl.h10
2 files changed, 6 insertions, 8 deletions
diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c
index 90969104dd39..9b84f373af19 100644
--- a/fs/cifs/cifsacl.c
+++ b/fs/cifs/cifsacl.c
@@ -46,11 +46,11 @@ static int parse_sid(struct cifs_sid *psid, char *end_of_acl)
46 } 46 }
47#ifdef CONFIG_CIFS_DEBUG2 47#ifdef CONFIG_CIFS_DEBUG2
48 cFYI(1, ("revision %d num_auth %d First subauth 0x%x", 48 cFYI(1, ("revision %d num_auth %d First subauth 0x%x",
49 psid->revision, psid->num_auth, psid->sub_auth[0])); 49 psid->revision, psid->num_subauth, psid->sub_auth[0]));
50 50
51 /* BB add length check to make sure that we do not have huge num auths 51 /* BB add length check to make sure that we do not have huge num auths
52 and therefore go off the end */ 52 and therefore go off the end */
53 cFYI(1, ("RID 0x%x", le32_to_cpu(psid->sub_auth[psid->num_auth]))); 53 cFYI(1, ("RID 0x%x", le32_to_cpu(psid->sub_auth[psid->num_subauth])));
54#endif 54#endif
55 return 0; 55 return 0;
56} 56}
diff --git a/fs/cifs/cifsacl.h b/fs/cifs/cifsacl.h
index b975ae113037..5e7b56738cc5 100644
--- a/fs/cifs/cifsacl.h
+++ b/fs/cifs/cifsacl.h
@@ -33,10 +33,9 @@ struct cifs_ntsd {
33 33
34struct cifs_sid { 34struct cifs_sid {
35 __u8 revision; /* revision level */ 35 __u8 revision; /* revision level */
36 __u8 num_auth; 36 __u8 num_subauth;
37 __u8 authority[6]; 37 __u8 authority[6];
38 __u32 sub_auth[4]; 38 __u32 sub_auth[0]; /* sub_auth[num_subauth] */
39 __u32 rid;
40} __attribute__((packed)); 39} __attribute__((packed));
41 40
42struct cifs_acl { 41struct cifs_acl {
@@ -54,10 +53,9 @@ struct cifs_ntace {
54 53
55struct cifs_ace { 54struct cifs_ace {
56 __u8 revision; /* revision level */ 55 __u8 revision; /* revision level */
57 __u8 num_auth; 56 __u8 num_subauth;
58 __u8 authority[6]; 57 __u8 authority[6];
59 __u32 sub_auth[4]; 58 __u32 sub_auth[0];
60 __u32 rid;
61} __attribute__((packed)); 59} __attribute__((packed));
62 60
63/* everyone */ 61/* everyone */