Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e375929 authored by James Morris's avatar James Morris
Browse files

Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into for-linus2

parents 096fe9ea f3bef679

security/selinux/ss/conditional.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

	}