security/apparmor/label.c: Clean code by removing redundant instructions (c84b80cd) · Commits · 戴 / test

Previously 'label->proxy->label' value checking and conditional reassigning were done twice in the same function. The second one is redundant and can be removed. Signed-off-by:

Mateusz Nosek <mateusznosek0@gmail.com> Signed-off-by:

John Johansen <john.johansen@canonical.com>

security/apparmor/label.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -311,8 +311,6 @@ out:

		static void label_destroy(struct aa_label *label)
		{
		struct aa_label *tmp;

		AA_BUG(!label);

		if (!label_isprofile(label)) {
		@@ -333,10 +331,6 @@ static void label_destroy(struct aa_label *label)

		aa_free_secid(label->secid);

		tmp = rcu_dereference_protected(label->proxy->label, true);
		if (tmp == label)
		rcu_assign_pointer(label->proxy->label, NULL);

		aa_put_proxy(label->proxy);
		label->proxy = (struct aa_proxy *) PROXY_POISON + 1;
		}

Admin message