Merge "selinux: ensure we cleanup the internal AVC counters on error in avc_insert()"

	struct avc_node *pos, *node = NULL;

	int hvalue;

	unsigned long flag;

	spinlock_t *lock;

	struct hlist_head *head;

	if (avc_latest_notif_update(avc, avd->seqno, 1))

		goto out;

		return NULL;

	node = avc_alloc_node(avc);

	if (node) {

		struct hlist_head *head;

		spinlock_t *lock;

		int rc = 0;

	if (!node)

		return NULL;

		hvalue = avc_hash(ssid, tsid, tclass);

	avc_node_populate(node, ssid, tsid, tclass, avd);

		rc = avc_xperms_populate(node, xp_node);

		if (rc) {

			kmem_cache_free(avc_node_cachep, node);

	if (avc_xperms_populate(node, xp_node)) {

		avc_node_kill(avc, node);

		return NULL;

	}

	hvalue = avc_hash(ssid, tsid, tclass);

	head = &avc->avc_cache.slots[hvalue];

	lock = &avc->avc_cache.slots_lock[hvalue];

	spin_lock_irqsave(lock, flag);

	hlist_for_each_entry(pos, head, list) {

		if (pos->ae.ssid == ssid &&

			goto found;

		}

	}

	hlist_add_head_rcu(&node->list, head);

found:

	spin_unlock_irqrestore(lock, flag);

	}

out:

	return node;

}