diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-16 11:11:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-16 11:11:58 -0800 |
| commit | 8bda68d68b21cb9881dcc7159fd9db1b6f95ac15 (patch) | |
| tree | 9582a3de232697ef8685e3b30179eb7f4ec2c6fe /security/smack/smack_lsm.c | |
| parent | e20a9b92ddbfe662807622dbb28e1fbb6e0011aa (diff) | |
| parent | 9b0072e2b2b588ad75c94f2c6e6c52c8f4bd2657 (diff) | |
Merge tag 'Smack-for-5.11' of git://github.com/cschaufler/smack-next
Pull smack updates from Casey Schaufler:
"There are no functional changes. Just one minor code clean-up and a
set of corrections in function header comments"
* tag 'Smack-for-5.11' of git://github.com/cschaufler/smack-next:
security/smack: remove unused varible 'rc'
Smack: fix kernel-doc interface on functions
Diffstat (limited to 'security/smack/smack_lsm.c')
| -rw-r--r-- | security/smack/smack_lsm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index 3a62d6aa74a6..f69c3dd9a0c6 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c @@ -3870,7 +3870,6 @@ static struct smack_known *smack_from_netlbl(const struct sock *sk, u16 family, struct netlbl_lsm_secattr secattr; struct socket_smack *ssp = NULL; struct smack_known *skp = NULL; - int rc; netlbl_secattr_init(&secattr); @@ -3880,7 +3879,7 @@ static struct smack_known *smack_from_netlbl(const struct sock *sk, u16 family, if (netlbl_skbuff_getattr(skb, family, &secattr) == 0) { skp = smack_from_secattr(&secattr, ssp); if (secattr.flags & NETLBL_SECATTR_CACHEABLE) - rc = netlbl_cache_add(skb, family, &skp->smk_netlabel); + netlbl_cache_add(skb, family, &skp->smk_netlabel); } netlbl_secattr_destroy(&secattr); |