diff options
| author | Willem de Bruijn <willemb@google.com> | 2018-12-21 20:06:59 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-01-13 12:07:10 +0300 |
| commit | 6a40c2da9c01785f089ca502edaf99a8e8eef4bc (patch) | |
| tree | d1e53aeb6cf994d63e9bbee996d5954cce4b0f0a /net/packet | |
| parent | 1c85a9064fbf5dcd7a9d36355c36f423b5691d2e (diff) | |
| download | linux-6a40c2da9c01785f089ca502edaf99a8e8eef4bc.tar.xz | |
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: syzbot <syzkaller@googlegroups.com>
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>
Diffstat (limited to 'net/packet')
| -rw-r--r-- | net/packet/af_packet.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 473858cb4c5d..bd174f9f62f1 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -2275,6 +2275,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; @@ -2436,6 +2438,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; |