Patch "selftests/bpf: Set gopt opt_class to 0 if get tunnel opt failed" has been added to the 5.4-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    selftests/bpf: Set gopt opt_class to 0 if get tunnel opt failed

to the 5.4-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     selftests-bpf-set-gopt-opt_class-to-0-if-get-tunnel-.patch
and it can be found in the queue-5.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 824b3a8c7948f8a28103c1207f426d31478d2aae
Author: Hangbin Liu <liuhangbin@xxxxxxxxx>
Date:   Tue Mar 9 11:22:14 2021 +0800

    selftests/bpf: Set gopt opt_class to 0 if get tunnel opt failed
    
    [ Upstream commit 31254dc9566221429d2cfb45fd5737985d70f2b6 ]
    
    When fixing the bpf test_tunnel.sh geneve failure. I only fixed the IPv4
    part but forgot the IPv6 issue. Similar with the IPv4 fixes 557c223b643a
    ("selftests/bpf: No need to drop the packet when there is no geneve opt"),
    when there is no tunnel option and bpf_skb_get_tunnel_opt() returns error,
    there is no need to drop the packets and break all geneve rx traffic.
    Just set opt_class to 0 and keep returning TC_ACT_OK at the end.
    
    Fixes: 557c223b643a ("selftests/bpf: No need to drop the packet when there is no geneve opt")
    Fixes: 933a741e3b82 ("selftests/bpf: bpf tunnel test.")
    Signed-off-by: Hangbin Liu <liuhangbin@xxxxxxxxx>
    Signed-off-by: Daniel Borkmann <daniel@xxxxxxxxxxxxx>
    Acked-by: William Tu <u9012063@xxxxxxxxx>
    Link: https://lore.kernel.org/bpf/20210309032214.2112438-1-liuhangbin@xxxxxxxxx
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/tools/testing/selftests/bpf/progs/test_tunnel_kern.c b/tools/testing/selftests/bpf/progs/test_tunnel_kern.c
index b4e9a1d8c6cd..141670ab4e67 100644
--- a/tools/testing/selftests/bpf/progs/test_tunnel_kern.c
+++ b/tools/testing/selftests/bpf/progs/test_tunnel_kern.c
@@ -508,10 +508,8 @@ int _ip6geneve_get_tunnel(struct __sk_buff *skb)
 	}
 
 	ret = bpf_skb_get_tunnel_opt(skb, &gopt, sizeof(gopt));
-	if (ret < 0) {
-		ERROR(ret);
-		return TC_ACT_SHOT;
-	}
+	if (ret < 0)
+		gopt.opt_class = 0;
 
 	bpf_trace_printk(fmt, sizeof(fmt),
 			key.tunnel_id, key.remote_ipv4, gopt.opt_class);