diff options
| author | Daniel Borkmann <daniel@iogearbox.net> | 2015-11-12 01:25:41 +0300 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-12-18 19:06:18 +0300 |
| commit | 66a74d9654121cd7c2ea432f19bd682a12d96835 (patch) | |
| tree | 9eae60e8ab21a20752587db0c8a51d3c4417b574 /net | |
| parent | 6e238517b4addfb28ba8a94687af174200227b89 (diff) | |
| download | linux-66a74d9654121cd7c2ea432f19bd682a12d96835.tar.xz | |
packet: always probe for transport header
commit 8fd6c80d9dd938ca338c70698533a7e304752846 upstream.
We concluded that the skb_probe_transport_header() should better be
called unconditionally. Avoiding the call into the flow dissector has
also not really much to do with the direct xmit mode.
While it seems that only virtio_net code makes use of GSO from non
RX/TX ring packet socket paths, we should probe for a transport header
nevertheless before they hit devices.
Reference: http://thread.gmane.org/gmane.linux.network/386173/
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/packet/af_packet.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index ede33f60991a..e9ea7ff99bc0 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -2216,8 +2216,7 @@ static int tpacket_fill_skb(struct packet_sock *po, struct sk_buff *skb, len = ((to_write > len_max) ? len_max : to_write); } - if (!packet_use_direct_xmit(po)) - skb_probe_transport_header(skb, 0); + skb_probe_transport_header(skb, 0); return tp_len; } @@ -2540,8 +2539,8 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len) len += vnet_hdr_len; } - if (!packet_use_direct_xmit(po)) - skb_probe_transport_header(skb, reserve); + skb_probe_transport_header(skb, reserve); + if (unlikely(extra_len == 4)) skb->no_fcs = 1; |