diff options
| author | James Morris <jmorris@namei.org> | 2011-05-04 11:59:34 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-05-04 11:59:34 +1000 |
| commit | 6f239284542bae297d27355d06afbb8df23c5db9 (patch) | |
| tree | b0ba42fb54cd05178c61584e0913be38a57f0384 /security | |
| parent | 609cfda586c7fe3e5d1a02c51edb587506294167 (diff) | |
| parent | bf69d41d198138e3c601e9a6645f4f1369aff7e0 (diff) | |
| download | linux-3.10-6f239284542bae297d27355d06afbb8df23c5db9.tar.gz linux-3.10-6f239284542bae297d27355d06afbb8df23c5db9.tar.bz2 linux-3.10-6f239284542bae297d27355d06afbb8df23c5db9.zip | |
Merge branch 'for-linus' of git://git.infradead.org/users/eparis/selinux into for-linus
Diffstat (limited to 'security')
| -rw-r--r-- | security/selinux/hooks.c | 3 | ||||
| -rw-r--r-- | security/selinux/ss/policydb.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index f7cf0ea6fae..8fb24884300 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -1578,7 +1578,8 @@ static int may_create(struct inode *dir, return rc; if (!newsid || !(sbsec->flags & SE_SBLABELSUPP)) { - rc = security_transition_sid(sid, dsec->sid, tclass, NULL, &newsid); + rc = security_transition_sid(sid, dsec->sid, tclass, + &dentry->d_name, &newsid); if (rc) return rc; } diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c index e7b850ad57e..e6e7ce0d3d5 100644 --- a/security/selinux/ss/policydb.c +++ b/security/selinux/ss/policydb.c @@ -502,7 +502,7 @@ static int policydb_index(struct policydb *p) goto out; rc = flex_array_prealloc(p->type_val_to_struct_array, 0, - p->p_types.nprim - 1, GFP_KERNEL | __GFP_ZERO); + p->p_types.nprim, GFP_KERNEL | __GFP_ZERO); if (rc) goto out; @@ -519,7 +519,7 @@ static int policydb_index(struct policydb *p) goto out; rc = flex_array_prealloc(p->sym_val_to_name[i], - 0, p->symtab[i].nprim - 1, + 0, p->symtab[i].nprim, GFP_KERNEL | __GFP_ZERO); if (rc) goto out; @@ -2375,7 +2375,7 @@ int policydb_read(struct policydb *p, void *fp) goto bad; /* preallocate so we don't have to worry about the put ever failing */ - rc = flex_array_prealloc(p->type_attr_map_array, 0, p->p_types.nprim - 1, + rc = flex_array_prealloc(p->type_attr_map_array, 0, p->p_types.nprim, GFP_KERNEL | __GFP_ZERO); if (rc) goto bad; |