lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[CIFS] acl support part 6

Browse Source 
CC: Shirish Pargaonkar <shirishp@us.ibm.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
This commit is contained in:
Steve French
2007-10-23 21:22:55 +00:00
parent c94897790e
commit 44093ca2fe
3 changed files with 27 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
fs/cifs/cifsacl.c
View File

@@ -38,8 +38,8 @@ static struct cifs_wksid wksidarr[NUM_WK_SIDS] = {
{{1, 1, {0, 0, 0, 0, 0, 5}, {cpu_to_le32(18), 0, 0, 0, 0} }, "sys"}, {{1, 1, {0, 0, 0, 0, 0, 5}, {cpu_to_le32(18), 0, 0, 0, 0} }, "sys"},
{{1, 2, {0, 0, 0, 0, 0, 5}, {cpu_to_le32(32), cpu_to_le32(544), 0, 0, 0} }, "root"}, {{1, 2, {0, 0, 0, 0, 0, 5}, {cpu_to_le32(32), cpu_to_le32(544), 0, 0, 0} }, "root"},
{{1, 2, {0, 0, 0, 0, 0, 5}, {cpu_to_le32(32), cpu_to_le32(545), 0, 0, 0} }, "users"}, {{1, 2, {0, 0, 0, 0, 0, 5}, {cpu_to_le32(32), cpu_to_le32(545), 0, 0, 0} }, "users"},
{{1, 2, {0, 0, 0, 0, 0, 5}, {cpu_to_le32(32), cpu_to_le32(546), 0, 0, 0} }, "guest"} {{1, 2, {0, 0, 0, 0, 0, 5}, {cpu_to_le32(32), cpu_to_le32(546), 0, 0, 0} }, "guest"} }
}; ;
/* security id for everyone */ /* security id for everyone */
@@ -131,6 +131,8 @@ int compare_sids(struct cifs_sid *ctsid, struct cifs_sid *cwsid)
void get_mode_from_acl(struct inode * inode, const char * path) void get_mode_from_acl(struct inode * inode, const char * path)
{ {
cFYI(1, ("get mode from ACL for %s", path));
if (inode == NULL) if (inode == NULL)
return; return;
@@ -159,50 +161,36 @@ static void parse_ace(struct cifs_ace *pace, char *end_of_acl)
/* validate that we do not go past end of acl */ /* validate that we do not go past end of acl */
/* XXX this if statement can be removed if (le16_to_cpu(pace->size) < 16) {
if (end_of_acl < (char *)pace + sizeof(struct cifs_ace)) { cERROR(1, ("ACE too small, %d", le16_to_cpu(pace->size)));
return;
}
if (end_of_acl < (char *)pace + le16_to_cpu(pace->size)) {
cERROR(1, ("ACL too small to parse ACE")); cERROR(1, ("ACL too small to parse ACE"));
return; return;
} */ }
num_subauth = pace->num_subauth; num_subauth = pace->sid.num_subauth;
if (num_subauth) { if (num_subauth) {
#ifdef CONFIG_CIFS_DEBUG2 #ifdef CONFIG_CIFS_DEBUG2
int i; int i;
cFYI(1, ("ACE revision %d num_subauth %d", cFYI(1, ("ACE revision %d num_auth %d type %d flags %d size %d",
pace->revision, pace->num_subauth)); pace->sid.revision, pace->sid.num_subauth, pace->type,
pace->flags, pace->size));
for (i = 0; i < num_subauth; ++i) { for (i = 0; i < num_subauth; ++i) {
cFYI(1, ("ACE sub_auth[%d]: 0x%x", i, cFYI(1, ("ACE sub_auth[%d]: 0x%x", i,
le32_to_cpu(pace->sub_auth[i]))); le32_to_cpu(pace->sid.sub_auth[i])));
} }
/* BB add length check to make sure that we do not have huge /* BB add length check to make sure that we do not have huge
num auths and therefore go off the end */ num auths and therefore go off the end */
cFYI(1, ("RID %d", le32_to_cpu(pace->sub_auth[num_subauth-1])));
#endif #endif
} }
return; return;
} }
static void parse_ntace(struct cifs_ntace *pntace, char *end_of_acl)
{
/* validate that we do not go past end of acl */
if (end_of_acl < (char *)pntace + sizeof(struct cifs_ntace)) {
cERROR(1, ("ACL too small to parse NT ACE"));
return;
}
#ifdef CONFIG_CIFS_DEBUG2
cFYI(1, ("NTACE type %d flags 0x%x size %d, access Req 0x%x",
pntace->type, pntace->flags, pntace->size,
pntace->access_req));
#endif
return;
}
static void parse_dacl(struct cifs_acl *pdacl, char *end_of_acl, static void parse_dacl(struct cifs_acl *pdacl, char *end_of_acl,
struct cifs_sid *pownersid, struct cifs_sid *pgrpsid) struct cifs_sid *pownersid, struct cifs_sid *pgrpsid)
@@ -211,7 +199,6 @@ static void parse_dacl(struct cifs_acl *pdacl, char *end_of_acl,
int num_aces = 0; int num_aces = 0;
int acl_size; int acl_size;
char *acl_base; char *acl_base;
struct cifs_ntace **ppntace;
struct cifs_ace **ppace; struct cifs_ace **ppace;
/* BB need to add parm so we can store the SID BB */ /* BB need to add parm so we can store the SID BB */
@@ -233,45 +220,27 @@ static void parse_dacl(struct cifs_acl *pdacl, char *end_of_acl,
num_aces = le32_to_cpu(pdacl->num_aces); num_aces = le32_to_cpu(pdacl->num_aces);
if (num_aces > 0) { if (num_aces > 0) {
ppntace = kmalloc(num_aces * sizeof(struct cifs_ntace *),
GFP_KERNEL);
ppace = kmalloc(num_aces * sizeof(struct cifs_ace *), ppace = kmalloc(num_aces * sizeof(struct cifs_ace *),
GFP_KERNEL); GFP_KERNEL);
/* cifscred->cecount = pdacl->num_aces; /* cifscred->cecount = pdacl->num_aces;
cifscred->ntaces = kmalloc(num_aces *
sizeof(struct cifs_ntace *), GFP_KERNEL);
cifscred->aces = kmalloc(num_aces * cifscred->aces = kmalloc(num_aces *
sizeof(struct cifs_ace *), GFP_KERNEL);*/ sizeof(struct cifs_ace *), GFP_KERNEL);*/
for (i = 0; i < num_aces; ++i) { for (i = 0; i < num_aces; ++i) {
ppntace[i] = (struct cifs_ntace *) ppace[i] = (struct cifs_ace *) (acl_base + acl_size);
(acl_base + acl_size);
ppace[i] = (struct cifs_ace *) ((char *)ppntace[i] +
sizeof(struct cifs_ntace));
parse_ntace(ppntace[i], end_of_acl); parse_ace(ppace[i], end_of_acl);
if (end_of_acl < ((char *)ppace[i] +
(le16_to_cpu(ppntace[i]->size) -
sizeof(struct cifs_ntace)))) {
cERROR(1, ("ACL too small to parse ACE"));
break;
} else
parse_ace(ppace[i], end_of_acl);
/* memcpy((void *)(&(cifscred->ntaces[i])), /* memcpy((void *)(&(cifscred->aces[i])),
(void *)ppntace[i],
sizeof(struct cifs_ntace));
memcpy((void *)(&(cifscred->aces[i])),
(void *)ppace[i], (void *)ppace[i],
sizeof(struct cifs_ace)); */ sizeof(struct cifs_ace)); */
acl_base = (char *)ppntace[i]; acl_base = (char *)ppace[i];
acl_size = le16_to_cpu(ppntace[i]->size); acl_size = le16_to_cpu(ppace[i]->size);
} }
kfree(ppace); kfree(ppace);
kfree(ppntace);
} }
return; return;
@@ -292,8 +261,8 @@ static int parse_sid(struct cifs_sid *psid, char *end_of_acl)
if (psid->num_subauth) { if (psid->num_subauth) {
#ifdef CONFIG_CIFS_DEBUG2 #ifdef CONFIG_CIFS_DEBUG2
int i; int i;
cFYI(1, ("SID revision %d num_auth %d First subauth 0x%x", cFYI(1, ("SID revision %d num_auth %d",
psid->revision, psid->num_subauth, psid->sub_auth[0])); psid->revision, psid->num_subauth));
for (i = 0; i < psid->num_subauth; i++) { for (i = 0; i < psid->num_subauth; i++) {
cFYI(1, ("SID sub_auth[%d]: 0x%x ", i, cFYI(1, ("SID sub_auth[%d]: 0x%x ", i,

12
fs/cifs/cifsacl.h
View File

@@ -48,7 +48,7 @@ struct cifs_sid {
__u8 revision; /* revision level */ __u8 revision; /* revision level */
__u8 num_subauth; __u8 num_subauth;
__u8 authority[6]; __u8 authority[6];
__le32 sub_auth[5]; /* sub_auth[num_subauth] */ /* BB FIXME endianness BB */ __le32 sub_auth[5]; /* sub_auth[num_subauth] */
} __attribute__((packed)); } __attribute__((packed));
struct cifs_acl { struct cifs_acl {
@@ -57,18 +57,12 @@ struct cifs_acl {
__le32 num_aces; __le32 num_aces;
} __attribute__((packed)); } __attribute__((packed));
struct cifs_ntace { /* first part of ACE which contains perms */ struct cifs_ace {
__u8 type; __u8 type;
__u8 flags; __u8 flags;
__le16 size; __le16 size;
__le32 access_req; __le32 access_req;
} __attribute__((packed)); struct cifs_sid sid; /* ie UUID of user or group who gets these perms */
struct cifs_ace { /* last part of ACE which includes user info */
__u8 revision; /* revision level */
__u8 num_subauth;
__u8 authority[6];
__le32 sub_auth[5];
} __attribute__((packed)); } __attribute__((packed));
struct cifs_wksid { struct cifs_wksid {

2
fs/cifs/dir.c
View File

@@ -593,7 +593,7 @@ static int cifs_ci_compare(struct dentry *dentry, struct qstr *a,
* case take precedence. If a is not a negative dentry, this * case take precedence. If a is not a negative dentry, this
* should have no side effects * should have no side effects
*/ */
memcpy((unsigned char *)a->name, b->name, a->len); memcpy(a->name, b->name, a->len);
return 0; return 0;
} }
return 1; return 1;