Merge "selinux: ensure we cleanup the internal AVC counters on error in avc_insert()" (0dce2c3b) · Commits · e / devices / android_kernel_xiaomi_nabu

security/selinux/avc.c

+25 −27

Original line number	Diff line number	Diff line
		@@ -663,26 +663,25 @@ static struct avc_node *avc_insert(u32 ssid, u32 tsid, u16 tclass,
		struct avc_node pos, node = NULL;
		int hvalue;
		unsigned long flag;
		spinlock_t *lock;
		struct hlist_head *head;

		if (avc_latest_notif_update(avd->seqno, 1))
		goto out;
		return NULL;

		node = avc_alloc_node();
		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(node);
		return NULL;
		}

		hvalue = avc_hash(ssid, tsid, tclass);
		head = &avc_cache.slots[hvalue];
		lock = &avc_cache.slots_lock[hvalue];

		spin_lock_irqsave(lock, flag);
		hlist_for_each_entry(pos, head, list) {
		if (pos->ae.ssid == ssid &&
		@@ -692,11 +691,10 @@ static struct avc_node *avc_insert(u32 ssid, u32 tsid, u16 tclass,
		goto found;
		}
		}

		hlist_add_head_rcu(&node->list, head);
		found:
		spin_unlock_irqrestore(lock, flag);
		}
		out:
		return node;
		}