diff options
| author | Alexander Duyck <aduyck@mirantis.com> | 2016-04-14 15:33:37 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-16 19:09:13 -0400 |
| commit | aed069df099cd1a27900acb56bb892ec24c66ac4 (patch) | |
| tree | 8d25251d281421e71d2a30b9c72716885217c5e3 /net/ipv4/ipip.c | |
| parent | ec9dcd3507f055f025a7692a1ff90ce105f84c1b (diff) | |
| download | talos-obmc-linux-aed069df099cd1a27900acb56bb892ec24c66ac4.tar.gz talos-obmc-linux-aed069df099cd1a27900acb56bb892ec24c66ac4.zip | |
ip_tunnel_core: iptunnel_handle_offloads returns int and doesn't free skb
This patch updates the IP tunnel core function iptunnel_handle_offloads so
that we return an int and do not free the skb inside the function. This
actually allows us to clean up several paths in several tunnels so that we
can free the skb at one point in the path without having to have a
secondary path if we are supporting tunnel offloads.
In addition it should resolve some double-free issues I have found in the
tunnels paths as I believe it is possible for us to end up triggering such
an event in the case of fou or gue.
Signed-off-by: Alexander Duyck <aduyck@mirantis.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ipip.c')
| -rw-r--r-- | net/ipv4/ipip.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index ec51d02166de..92827483ee3d 100644 --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c @@ -219,9 +219,8 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) if (unlikely(skb->protocol != htons(ETH_P_IP))) goto tx_error; - skb = iptunnel_handle_offloads(skb, SKB_GSO_IPIP); - if (IS_ERR(skb)) - goto out; + if (iptunnel_handle_offloads(skb, SKB_GSO_IPIP)) + goto tx_error; skb_set_inner_ipproto(skb, IPPROTO_IPIP); @@ -230,7 +229,7 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) tx_error: kfree_skb(skb); -out: + dev->stats.tx_errors++; return NETDEV_TX_OK; } |
