]> git.itanic.dy.fi Git - linux-stable/commit
packet: only allow extra vlan len on ethernet devices
authorDaniel Borkmann <daniel@iogearbox.net>
Wed, 11 Nov 2015 22:25:42 +0000 (23:25 +0100)
committerSasha Levin <sasha.levin@oracle.com>
Mon, 14 Dec 2015 17:19:22 +0000 (12:19 -0500)
commit9293664afffe9a2fe04be4f8da1869601c3afba0
tree5f59db20560ea45e13662c86ad3c6c18fd218e62
parente4f3c00338a3ddcc1c222396816d18a670ac4e67
packet: only allow extra vlan len on ethernet devices

[ Upstream commit 3c70c132488794e2489ab045559b0ce0afcf17de ]

Packet sockets can be used by various net devices and are not
really restricted to ARPHRD_ETHER device types. However, when
currently checking for the extra 4 bytes that can be transmitted
in VLAN case, our assumption is that we generally probe on
ARPHRD_ETHER devices. Therefore, before looking into Ethernet
header, check the device type first.

This also fixes the issue where non-ARPHRD_ETHER devices could
have no dev->hard_header_len in TX_RING SOCK_RAW case, and thus
the check would test unfilled linear part of the skb (instead
of non-linear).

Fixes: 57f89bfa2140 ("network: Allow af_packet to transmit +4 bytes for VLAN packets.")
Fixes: 52f1454f629f ("packet: allow to transmit +4 byte in TX_RING slot for VLAN case")
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
net/packet/af_packet.c