summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorVasyl Gomonovych <gomonovych@gmail.com>2017-12-21 16:57:52 +0100
committerCasey Schaufler <casey@schaufler-ca.com>2017-12-27 23:43:19 +0100
commitda49b5dad18aad357ab8841ee65d415f683efc6f (patch)
tree244ed6c95034085c102d3c1a26c47573259ff962 /security
parentSync to v4.15-rc3 for security subsystem developers to work against. (diff)
downloadlinux-da49b5dad18aad357ab8841ee65d415f683efc6f.tar.xz
linux-da49b5dad18aad357ab8841ee65d415f683efc6f.zip
Smack: fix dereferenced before check
This patch fixes the warning reported by smatch: security/smack/smack_lsm.c:2872 smack_socket_connect() warn: variable dereferenced before check 'sock->sk' (see line 2869) Signed-off-by: Vasyl Gomonovych <gomonovych@gmail.com> Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
Diffstat (limited to 'security')
-rw-r--r--security/smack/smack_lsm.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index 14cc7940b36d..30f2c3d1c11c 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -2866,12 +2866,16 @@ static int smack_socket_connect(struct socket *sock, struct sockaddr *sap,
#endif
#ifdef SMACK_IPV6_SECMARK_LABELING
struct smack_known *rsp;
- struct socket_smack *ssp = sock->sk->sk_security;
+ struct socket_smack *ssp;
#endif
if (sock->sk == NULL)
return 0;
+#ifdef SMACK_IPV6_SECMARK_LABELING
+ ssp = sock->sk->sk_security;
+#endif
+
switch (sock->sk->sk_family) {
case PF_INET:
if (addrlen < sizeof(struct sockaddr_in))