]>
Commit | Line | Data |
---|---|---|
e7503a51 GKH |
1 | From foo@baz Sat Jan 5 08:30:28 CET 2019 |
2 | From: Willem de Bruijn <willemb@google.com> | |
3 | Date: Sat, 22 Dec 2018 16:53:45 -0500 | |
4 | Subject: packet: validate address length if non-zero | |
5 | ||
6 | From: Willem de Bruijn <willemb@google.com> | |
7 | ||
8 | [ Upstream commit 6b8d95f1795c42161dc0984b6863e95d6acf24ed ] | |
9 | ||
10 | Validate packet socket address length if a length is given. Zero | |
11 | length is equivalent to not setting an address. | |
12 | ||
13 | Fixes: 99137b7888f4 ("packet: validate address length") | |
14 | Reported-by: Ido Schimmel <idosch@idosch.org> | |
15 | Signed-off-by: Willem de Bruijn <willemb@google.com> | |
16 | Signed-off-by: David S. Miller <davem@davemloft.net> | |
17 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
18 | --- | |
19 | net/packet/af_packet.c | 4 ++-- | |
20 | 1 file changed, 2 insertions(+), 2 deletions(-) | |
21 | ||
22 | --- a/net/packet/af_packet.c | |
23 | +++ b/net/packet/af_packet.c | |
24 | @@ -2511,7 +2511,7 @@ static int tpacket_snd(struct packet_soc | |
25 | sll_addr))) | |
26 | goto out; | |
27 | proto = saddr->sll_protocol; | |
28 | - addr = saddr->sll_addr; | |
29 | + addr = saddr->sll_halen ? saddr->sll_addr : NULL; | |
30 | dev = dev_get_by_index(sock_net(&po->sk), saddr->sll_ifindex); | |
31 | if (addr && dev && saddr->sll_halen < dev->addr_len) | |
32 | goto out; | |
33 | @@ -2680,7 +2680,7 @@ static int packet_snd(struct socket *soc | |
34 | if (msg->msg_namelen < (saddr->sll_halen + offsetof(struct sockaddr_ll, sll_addr))) | |
35 | goto out; | |
36 | proto = saddr->sll_protocol; | |
37 | - addr = saddr->sll_addr; | |
38 | + addr = saddr->sll_halen ? saddr->sll_addr : NULL; | |
39 | dev = dev_get_by_index(sock_net(sk), saddr->sll_ifindex); | |
40 | if (addr && dev && saddr->sll_halen < dev->addr_len) | |
41 | goto out; |