diff options
author | Willem de Bruijn <willemb@google.com> | 2018-12-22 16:53:45 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-01-13 10:07:10 +0100 |
commit | a782cc8f6fcb2ad3a4b905afec780b7d9d79cc4a (patch) | |
tree | 75b63b2372ddf53b43003183188f1d5a0098eb7d | |
parent | 6a40c2da9c01785f089ca502edaf99a8e8eef4bc (diff) | |
download | linux-stable-a782cc8f6fcb2ad3a4b905afec780b7d9d79cc4a.tar.gz linux-stable-a782cc8f6fcb2ad3a4b905afec780b7d9d79cc4a.tar.bz2 linux-stable-a782cc8f6fcb2ad3a4b905afec780b7d9d79cc4a.zip |
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: Ido Schimmel <idosch@idosch.org>
Signed-off-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | net/packet/af_packet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index bd174f9f62f1..65cfce2e5010 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -2273,7 +2273,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; @@ -2436,7 +2436,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; |