UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

security/apparmor/label.c: Clean code by removing redundant instructions 

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>
This commit is contained in:
Mateusz Nosek 2020-03-03 19:30:23 +01:00 committed by John Johansen
parent fe9fd23e3b
commit c84b80cd41
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
security/apparmor/label.c
View File

@ -311,8 +311,6 @@ out:
static void label_destroy(struct aa_label *label) static void label_destroy(struct aa_label *label)
{ {
struct aa_label *tmp;
AA_BUG(!label); AA_BUG(!label);
if (!label_isprofile(label)) { if (!label_isprofile(label)) {
@ -333,10 +331,6 @@ static void label_destroy(struct aa_label *label)
aa_free_secid(label->secid); 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); aa_put_proxy(label->proxy);
label->proxy = (struct aa_proxy *) PROXY_POISON + 1; label->proxy = (struct aa_proxy *) PROXY_POISON + 1;
} }