diff options
| author | James Morris <jmorris@namei.org> | 2012-01-09 12:16:48 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2012-01-09 12:16:48 +1100 |
| commit | 8fcc99549522fc7a0bbaeb5755855ab0d9a59ce8 (patch) | |
| tree | a118eaef15d4ba22247f45ee01537ecc906cd161 /security/selinux/ss/conditional.c | |
| parent | 805a6af8dba5dfdd35ec35dc52ec0122400b2610 (diff) | |
| parent | 7b7e5916aa2f46e57f8bd8cb89c34620ebfda5da (diff) | |
Merge branch 'next' into for-linus
Conflicts:
security/integrity/evm/evm_crypto.c
Resolved upstream fix vs. next conflict manually.
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/selinux/ss/conditional.c')
| -rw-r--r-- | security/selinux/ss/conditional.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/ss/conditional.c b/security/selinux/ss/conditional.c index 2ec904177fe0..377d148e7157 100644 --- a/security/selinux/ss/conditional.c +++ b/security/selinux/ss/conditional.c @@ -175,7 +175,7 @@ void cond_policydb_destroy(struct policydb *p) int cond_init_bool_indexes(struct policydb *p) { kfree(p->bool_val_to_struct); - p->bool_val_to_struct = (struct cond_bool_datum **) + p->bool_val_to_struct = kmalloc(p->p_bools.nprim * sizeof(struct cond_bool_datum *), GFP_KERNEL); if (!p->bool_val_to_struct) return -ENOMEM; |