diff options
| author | Daniel Borkmann <daniel@iogearbox.net> | 2015-11-11 23:25:42 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-11-16 00:00:35 +0100 |
| commit | 3c70c132488794e2489ab045559b0ce0afcf17de (patch) | |
| tree | 7d48a54696aaa56ab9db32fb8e04b57cfcfae3de /Makefile | |
| parent | packet: always probe for transport header (diff) | |
| download | linux-3c70c132488794e2489ab045559b0ce0afcf17de.tar.xz linux-3c70c132488794e2489ab045559b0ce0afcf17de.zip | |
packet: only allow extra vlan len on ethernet devices
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>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions