Commit b1b38444 authored Feb 26, 2015 by Jeff Vander Stoep Committed by Mark Salyzyn Oct 29, 2015

selinux: remove unnecessary pointer reassignment



(cherry pick from commit 83d4a806ae46397f606de7376b831524bd3a21e5)

Commit f01e1af4 ("selinux: don't pass in NULL avd to avc_has_perm_noaudit")
made this pointer reassignment unnecessary. Avd should continue to reference
the stack-based copy.

Signed-off-by: Jeff Vander Stoep <jeffv@google.com>
Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
[PM: tweaked subject line]
Signed-off-by: Paul Moore <pmoore@redhat.com>
Bug: 22846070
Change-Id: I8fcba45a5acc4de862bd5b3f07bf4980f67133c4

parent a6654a40

security/selinux/avc.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -729,12 +729,10 @@ inline int avc_has_perm_noaudit(u32 ssid, u32 tsid,
		rcu_read_lock();

		node = avc_lookup(ssid, tsid, tclass);
		if (unlikely(!node)) {
		if (unlikely(!node))
		node = avc_compute_av(ssid, tsid, tclass, avd);
		} else {
		else
		memcpy(avd, &node->ae.avd, sizeof(*avd));
		avd = &node->ae.avd;
		}

		denied = requested & ~(avd->allowed);
		if (unlikely(denied))