Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41783853 authored by Willem de Bruijn's avatar Willem de Bruijn Committed by Greg Kroah-Hartman
Browse files

packet: validate address length if non-zero 



[ Upstream commit 6b8d95f1795c42161dc0984b6863e95d6acf24ed ]

Validate packet socket address length if a length is given. Zero
length is equivalent to not setting an address.

Fixes: 99137b7888f4 ("packet: validate address length")
Reported-by: default avatarIdo Schimmel <idosch@idosch.org>
Signed-off-by: default avatarWillem de Bruijn <willemb@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9eee85ed

net/packet/af_packet.c

+2 −2
Original line number Diff line number Diff line
@@ -2663,7 +2663,7 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) 
						sll_addr)))

			goto out;

		proto	= saddr->sll_protocol;

		addr	= saddr->sll_addr;

		addr	= saddr->sll_halen ? saddr->sll_addr : NULL;

		dev = dev_get_by_index(sock_net(&po->sk), saddr->sll_ifindex);

		if (addr && dev && saddr->sll_halen < dev->addr_len)

			goto out;
@@ -2863,7 +2863,7 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len) 
		if (msg->msg_namelen < (saddr->sll_halen + offsetof(struct sockaddr_ll, sll_addr)))

			goto out;

		proto	= saddr->sll_protocol;

		addr	= saddr->sll_addr;

		addr	= saddr->sll_halen ? saddr->sll_addr : NULL;

		dev = dev_get_by_index(sock_net(sk), saddr->sll_ifindex);

		if (addr && dev && saddr->sll_halen < dev->addr_len)

			goto out;