diff options
author | Daniel Borkmann <daniel@iogearbox.net> | 2015-11-12 01:25:40 +0300 |
---|---|---|
committer | Sasha Levin <sasha.levin@oracle.com> | 2015-12-14 20:19:21 +0300 |
commit | 22fb967dc3ca91edb8298373d64beaec4a572373 (patch) | |
tree | 08174b3dd93b9ad146c200fa03daed88d6fd8296 /net | |
parent | e5d4fd3e2e4c0b373473fca676e40a8c4bee8b07 (diff) | |
download | linux-22fb967dc3ca91edb8298373d64beaec4a572373.tar.xz |
packet: do skb_probe_transport_header when we actually have data
[ Upstream commit efdfa2f7848f64517008136fb41f53c4a1faf93a ]
In tpacket_fill_skb() commit c1aad275b029 ("packet: set transport
header before doing xmit") and later on 40893fd0fd4e ("net: switch
to use skb_probe_transport_header()") was probing for a transport
header on the skb from a ring buffer slot, but at a time, where
the skb has _not even_ been filled with data yet. So that call into
the flow dissector is pretty useless. Lets do it after we've set
up the skb frags.
Fixes: c1aad275b029 ("packet: set transport header before doing xmit")
Reported-by: Eric Dumazet <edumazet@google.com>
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: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/packet/af_packet.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index bd4145be4975..9d5b9cea1ca7 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -2117,8 +2117,6 @@ static int tpacket_fill_skb(struct packet_sock *po, struct sk_buff *skb, skb_reserve(skb, hlen); skb_reset_network_header(skb); - if (!packet_use_direct_xmit(po)) - skb_probe_transport_header(skb, 0); if (unlikely(po->tp_tx_has_off)) { int off_min, off_max, off; off_min = po->tp_hdrlen - sizeof(struct sockaddr_ll); @@ -2202,6 +2200,9 @@ 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); + return tp_len; } |