[SRU][PATCH v4 B 1/2] security/apparmor/label.c: Clean code by removing redundant instructions

Georgia Garcia georgia.garcia at canonical.com
Thu Aug 19 13:28:02 UTC 2021


From: Mateusz Nosek <mateusznosek0 at gmail.com>

BugLink: https://bugs.launchpad.net/bugs/1939915

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 at gmail.com>
Signed-off-by: John Johansen <john.johansen at canonical.com>
(cherry picked from commit c84b80cd41e05395655459ecc652fa5ee05c257e)
Signed-off-by: Georgia Garcia <georgia.garcia at canonical.com>
---
 security/apparmor/label.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/security/apparmor/label.c b/security/apparmor/label.c
index 9171cd8ec032..c276d3035813 100644
--- a/security/apparmor/label.c
+++ b/security/apparmor/label.c
@@ -315,8 +315,6 @@ int aa_vec_unique(struct aa_profile **vec, int n, int flags)
 
 static void label_destroy(struct aa_label *label)
 {
-	struct aa_label *tmp;
-
 	AA_BUG(!label);
 
 	if (!label_isprofile(label)) {
@@ -337,10 +335,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;
 }
-- 
2.25.1




More information about the kernel-team mailing list