diff options
| author | James Morris <james.l.morris@oracle.com> | 2015-10-21 02:49:29 +0300 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2015-10-21 02:49:29 +0300 |
| commit | 09302fd19efbff9569eaad3f78ead8f411defd87 (patch) | |
| tree | ea7445250c19d8af6092eecb6908f1547dde86d6 /security/smack/smack_access.c | |
| parent | fbf98265891a672111dac8faabd190f62b678545 (diff) | |
| parent | 38416e53936ecf896948fdeffc36b76979117952 (diff) | |
| download | linux-09302fd19efbff9569eaad3f78ead8f411defd87.tar.xz | |
Merge branch 'smack-for-4.4' of https://github.com/cschaufler/smack-next into next
Diffstat (limited to 'security/smack/smack_access.c')
| -rw-r--r-- | security/smack/smack_access.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/security/smack/smack_access.c b/security/smack/smack_access.c index bc1053fb5d1d..a283f9e796c1 100644 --- a/security/smack/smack_access.c +++ b/security/smack/smack_access.c @@ -637,7 +637,7 @@ DEFINE_MUTEX(smack_onlycap_lock); int smack_privileged(int cap) { struct smack_known *skp = smk_of_current(); - struct smack_onlycap *sop; + struct smack_known_list_elem *sklep; /* * All kernel tasks are privileged @@ -654,8 +654,8 @@ int smack_privileged(int cap) return 1; } - list_for_each_entry_rcu(sop, &smack_onlycap_list, list) { - if (sop->smk_label == skp) { + list_for_each_entry_rcu(sklep, &smack_onlycap_list, list) { + if (sklep->smk_label == skp) { rcu_read_unlock(); return 1; } |