diff options
author | Casey Schaufler <casey@schaufler-ca.com> | 2019-04-30 17:13:32 -0400 |
---|---|---|
committer | Casey Schaufler <casey@schaufler-ca.com> | 2019-04-30 17:13:32 -0400 |
commit | 619ae03e922b65a1a5d4269ceae1e9e13a058d6b (patch) | |
tree | 7ddc44c9de95f8b00c367bd17ae091d745456d49 | |
parent | b9ef5513c99bf9c8bfd9c9e8051b67f52b2dee1e (diff) |
Smack: Fix kbuild reported build error
The variable sap is defined under ifdef, but a recently
added use of the variable was not. Put that use under ifdef
as well.
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
-rw-r--r-- | security/smack/smack_lsm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index b5b333d72637..0de725f88bed 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c | |||
@@ -3693,6 +3693,7 @@ static int smack_socket_sendmsg(struct socket *sock, struct msghdr *msg, | |||
3693 | return -EINVAL; | 3693 | return -EINVAL; |
3694 | rc = smack_netlabel_send(sock->sk, sip); | 3694 | rc = smack_netlabel_send(sock->sk, sip); |
3695 | break; | 3695 | break; |
3696 | #if IS_ENABLED(CONFIG_IPV6) | ||
3696 | case AF_INET6: | 3697 | case AF_INET6: |
3697 | if (msg->msg_namelen < SIN6_LEN_RFC2133 || | 3698 | if (msg->msg_namelen < SIN6_LEN_RFC2133 || |
3698 | sap->sin6_family != AF_INET6) | 3699 | sap->sin6_family != AF_INET6) |
@@ -3706,6 +3707,7 @@ static int smack_socket_sendmsg(struct socket *sock, struct msghdr *msg, | |||
3706 | #ifdef SMACK_IPV6_PORT_LABELING | 3707 | #ifdef SMACK_IPV6_PORT_LABELING |
3707 | rc = smk_ipv6_port_check(sock->sk, sap, SMK_SENDING); | 3708 | rc = smk_ipv6_port_check(sock->sk, sap, SMK_SENDING); |
3708 | #endif | 3709 | #endif |
3710 | #endif /* IS_ENABLED(CONFIG_IPV6) */ | ||
3709 | break; | 3711 | break; |
3710 | } | 3712 | } |
3711 | return rc; | 3713 | return rc; |