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 /drivers/net/vxlan.c | |
| parent | Merge branch 'w5100-spi-and-w5200-support' (diff) | |
| download | linux-dev-aed069df099cd1a27900acb56bb892ec24c66ac4.tar.xz linux-dev-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 'drivers/net/vxlan.c')
| -rw-r--r-- | drivers/net/vxlan.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index a7112b3bc9b4..c2e22c2532a1 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -1797,9 +1797,9 @@ static int vxlan_build_skb(struct sk_buff *skb, struct dst_entry *dst, if (WARN_ON(!skb)) return -ENOMEM; - skb = iptunnel_handle_offloads(skb, type); - if (IS_ERR(skb)) - return PTR_ERR(skb); + err = iptunnel_handle_offloads(skb, type); + if (err) + goto out_free; vxh = (struct vxlanhdr *) __skb_push(skb, sizeof(*vxh)); vxh->vx_flags = VXLAN_HF_VNI; |