diff options
Diffstat (limited to 'security/selinux/ss/conditional.c')
| -rw-r--r-- | security/selinux/ss/conditional.c | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/security/selinux/ss/conditional.c b/security/selinux/ss/conditional.c index 18643bf9894d..456e1a9bcfde 100644 --- a/security/selinux/ss/conditional.c +++ b/security/selinux/ss/conditional.c @@ -638,7 +638,7 @@ void cond_compute_av(struct avtab *ctab, struct avtab_key *key,  {  	struct avtab_node *node; -	if (!ctab || !key || !avd || !xperms) +	if (!ctab || !key || !avd)  		return;  	for (node = avtab_search_node(ctab, key); node; @@ -657,7 +657,7 @@ void cond_compute_av(struct avtab *ctab, struct avtab_key *key,  		if ((u16)(AVTAB_AUDITALLOW|AVTAB_ENABLED) ==  		    (node->key.specified & (AVTAB_AUDITALLOW|AVTAB_ENABLED)))  			avd->auditallow |= node->datum.u.data; -		if ((node->key.specified & AVTAB_ENABLED) && +		if (xperms && (node->key.specified & AVTAB_ENABLED) &&  				(node->key.specified & AVTAB_XPERMS))  			services_compute_xperms_drivers(xperms, node);  	}  | 
