| From c05804566350e9abffda4621dd6dfd12e2473c2b Mon Sep 17 00:00:00 2001 |
| From: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> |
| Date: Fri, 12 Apr 2019 19:52:36 +0900 |
| Subject: 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> |
| --- |
| drivers/isdn/mISDN/socket.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c |
| index 99e5f9751e8b1..f96b8f2bdf743 100644 |
| --- a/drivers/isdn/mISDN/socket.c |
| +++ b/drivers/isdn/mISDN/socket.c |
| @@ -712,10 +712,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); |
| -- |
| 2.20.1 |
| |
