Commit 04e65596 authored Apr 12, 2019 by Tetsuo Handa Committed by Greg Kroah-Hartman May 16, 2019

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>

parent dc068b0a

drivers/isdn/mISDN/socket.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -712,10 +712,10 @@ base_sock_bind(struct socket sock, struct sockaddr addr, int addr_len)
	struct sock *sk = sock->sk;		struct sock *sk = sock->sk;
	int err = 0;		int err = 0;

	if (!maddr \|\| maddr->family != AF_ISDN)		if (addr_len < sizeof(struct sockaddr_mISDN))
	return -EINVAL;		return -EINVAL;

	if (addr_len < sizeof(struct sockaddr_mISDN))		if (!maddr \|\| maddr->family != AF_ISDN)
	return -EINVAL;		return -EINVAL;

	lock_sock(sk);		lock_sock(sk);