From: wenxu <we...@ucloud.cn>

Fixes: 862a03c ("gre: refactor the gre_fb_xmit")
       1a66a83 ("gre: add collect_md mode to ERSPAN tunnel")

Signed-off-by: wenxu <we...@ucloud.cn>
---
 net/ipv4/ip_gre.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index d1d09f3..970500a 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -544,7 +544,7 @@ static void gre_fb_xmit(struct sk_buff *skb, struct 
net_device *dev,
 
        rt = prepare_fb_xmit(skb, dev, &fl, tunnel_hlen);
        if (!rt)
-               return;
+               goto err_free_skb;
 
        /* Push Tunnel header. */
        if (gre_handle_offloads(skb, !!(tun_info->key.tun_flags & TUNNEL_CSUM)))
@@ -592,10 +592,10 @@ static void erspan_fb_xmit(struct sk_buff *skb, struct 
net_device *dev,
 
        key = &tun_info->key;
        if (!(tun_info->key.tun_flags & TUNNEL_ERSPAN_OPT))
-               goto err_free_rt;
+               goto err_free_skb;
        md = ip_tunnel_info_opts(tun_info);
        if (!md)
-               goto err_free_rt;
+               goto err_free_skb;
 
        /* ERSPAN has fixed 8 byte GRE header */
        version = md->version;
@@ -603,7 +603,7 @@ static void erspan_fb_xmit(struct sk_buff *skb, struct 
net_device *dev,
 
        rt = prepare_fb_xmit(skb, dev, &fl, tunnel_hlen);
        if (!rt)
-               return;
+               goto err_free_skb;
 
        if (gre_handle_offloads(skb, false))
                goto err_free_rt;
-- 
1.8.3.1

Reply via email to