Skip to content

Commit 6b8d95f

Browse files
wdebruijdavem330
authored andcommitted
packet: validate address length if non-zero
Validate packet socket address length if a length is given. Zero length is equivalent to not setting an address. Fixes: 99137b7 ("packet: validate address length") Reported-by: Ido Schimmel <[email protected]> Signed-off-by: Willem de Bruijn <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent a95386f commit 6b8d95f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

net/packet/af_packet.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2625,7 +2625,7 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg)
26252625
sll_addr)))
26262626
goto out;
26272627
proto = saddr->sll_protocol;
2628-
addr = saddr->sll_addr;
2628+
addr = saddr->sll_halen ? saddr->sll_addr : NULL;
26292629
dev = dev_get_by_index(sock_net(&po->sk), saddr->sll_ifindex);
26302630
if (addr && dev && saddr->sll_halen < dev->addr_len)
26312631
goto out;
@@ -2825,7 +2825,7 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len)
28252825
if (msg->msg_namelen < (saddr->sll_halen + offsetof(struct sockaddr_ll, sll_addr)))
28262826
goto out;
28272827
proto = saddr->sll_protocol;
2828-
addr = saddr->sll_addr;
2828+
addr = saddr->sll_halen ? saddr->sll_addr : NULL;
28292829
dev = dev_get_by_index(sock_net(sk), saddr->sll_ifindex);
28302830
if (addr && dev && saddr->sll_halen < dev->addr_len)
28312831
goto out;

0 commit comments

Comments
 (0)