diff options
author | Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> | 2019-04-12 06:55:14 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-04-12 13:25:03 -0400 |
commit | c68e747d0a98f44a4e49071940a692fa83630e47 (patch) | |
tree | af5b48598d2420d3389c044b8d61b6fc3e1c2067 | |
parent | bd7d46ddca06f1fadd68ceb99bc6e6f808ab50f2 (diff) |
llc: Check address length before reading address field
KMSAN will complain if valid address length passed to bind() is shorter
than sizeof(struct sockaddr_llc) bytes.
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/llc/af_llc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c index b99e73a7e7e0..2017b7d780f5 100644 --- a/net/llc/af_llc.c +++ b/net/llc/af_llc.c | |||
@@ -320,14 +320,13 @@ static int llc_ui_bind(struct socket *sock, struct sockaddr *uaddr, int addrlen) | |||
320 | struct llc_sap *sap; | 320 | struct llc_sap *sap; |
321 | int rc = -EINVAL; | 321 | int rc = -EINVAL; |
322 | 322 | ||
323 | dprintk("%s: binding %02X\n", __func__, addr->sllc_sap); | ||
324 | |||
325 | lock_sock(sk); | 323 | lock_sock(sk); |
326 | if (unlikely(!sock_flag(sk, SOCK_ZAPPED) || addrlen != sizeof(*addr))) | 324 | if (unlikely(!sock_flag(sk, SOCK_ZAPPED) || addrlen != sizeof(*addr))) |
327 | goto out; | 325 | goto out; |
328 | rc = -EAFNOSUPPORT; | 326 | rc = -EAFNOSUPPORT; |
329 | if (unlikely(addr->sllc_family != AF_LLC)) | 327 | if (unlikely(addr->sllc_family != AF_LLC)) |
330 | goto out; | 328 | goto out; |
329 | dprintk("%s: binding %02X\n", __func__, addr->sllc_sap); | ||
331 | rc = -ENODEV; | 330 | rc = -ENODEV; |
332 | rcu_read_lock(); | 331 | rcu_read_lock(); |
333 | if (sk->sk_bound_dev_if) { | 332 | if (sk->sk_bound_dev_if) { |