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

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

packet: validate address length 



[ Upstream commit 99137b7888f4058087895d035d81c6b2d31015c5 ]

Packet sockets with SOCK_DGRAM may pass an address for use in
dev_hard_header. Ensure that it is of sufficient length.

Reported-by: default avatarsyzbot <syzkaller@googlegroups.com>
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 65b34802

net/packet/af_packet.c

+4 −0
Original line number Diff line number Diff line
@@ -2665,6 +2665,8 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) 
		proto	= saddr->sll_protocol;

		addr	= saddr->sll_addr;

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

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

			goto out;

	}



	err = -ENXIO;
@@ -2863,6 +2865,8 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len) 
		proto	= saddr->sll_protocol;

		addr	= saddr->sll_addr;

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

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

			goto out;

	}



	err = -ENXIO;