diff options
Diffstat (limited to 'security/selinux/ss/policydb.c')
| -rw-r--r-- | security/selinux/ss/policydb.c | 10 | 
1 files changed, 3 insertions, 7 deletions
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c index e7b850ad57e..7102457661d 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; @@ -1819,8 +1819,6 @@ static int filename_trans_read(struct policydb *p, void *fp)  		goto out;  	nel = le32_to_cpu(buf[0]); -	printk(KERN_ERR "%s: nel=%d\n", __func__, nel); -  	last = p->filename_trans;  	while (last && last->next)  		last = last->next; @@ -1857,8 +1855,6 @@ static int filename_trans_read(struct policydb *p, void *fp)  			goto out;  		name[len] = 0; -		printk(KERN_ERR "%s: ft=%p ft->name=%p ft->name=%s\n", __func__, ft, ft->name, ft->name); -  		rc = next_entry(buf, fp, sizeof(u32) * 4);  		if (rc)  			goto out; @@ -2375,7 +2371,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;  |