diff options
| author | Tetsuo Handa | 2019-04-12 12:52:36 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-05-16 19:41:21 +0200 |
| commit | f83beff280480438df97d7189582db7abdf208ba (patch) | |
| tree | 0a1f3d209b3d90bfdec6ff36758c1bc8bb206f33 /drivers/isdn | |
| parent | selftests: fib_tests: Fix 'Command line is not complete' errors (diff) | |
| download | kernel-qcow2-linux-f83beff280480438df97d7189582db7abdf208ba.tar.gz kernel-qcow2-linux-f83beff280480438df97d7189582db7abdf208ba.tar.xz kernel-qcow2-linux-f83beff280480438df97d7189582db7abdf208ba.zip | |
mISDN: Check address length before reading address family
[ Upstream commit 238ffdc49ef98b15819cfd5e3fb23194e3ea3d39 ]
KMSAN will complain if valid address length passed to bind() is shorter
than sizeof("struct sockaddr_mISDN"->family) bytes.
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/isdn')
| -rw-r--r-- | drivers/isdn/mISDN/socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c index 18c0a1281914..b2abc44fa5cb 100644 --- a/drivers/isdn/mISDN/socket.c +++ b/drivers/isdn/mISDN/socket.c @@ -711,10 +711,10 @@ base_sock_bind(struct socket *sock, struct sockaddr *addr, int addr_len) struct sock *sk = sock->sk; int err = 0; - if (!maddr || maddr->family != AF_ISDN) + if (addr_len < sizeof(struct sockaddr_mISDN)) return -EINVAL; - if (addr_len < sizeof(struct sockaddr_mISDN)) + if (!maddr || maddr->family != AF_ISDN) return -EINVAL; lock_sock(sk); |