]> git.itanic.dy.fi Git - linux-stable/commit
xfrm: policy: fix layer 4 flowi decoding
authorFlorian Westphal <fw@strlen.de>
Thu, 26 Oct 2023 14:45:42 +0000 (16:45 +0200)
committerSteffen Klassert <steffen.klassert@secunet.com>
Fri, 27 Oct 2023 08:12:09 +0000 (10:12 +0200)
commiteefed7662ff223f70ba8b1af07f1a096a5ece588
tree4699ec490e0ab0364feacc96a1723d4f38dea25e
parent53a5b4f2ea858482a427878bca988a7fa9b2ebdc
xfrm: policy: fix layer 4 flowi decoding

The commit shipped with two bugs:
 fl4->fl4_icmp_type = flkeys->icmp.type;
 fl4->fl4_icmp_type = flkeys->icmp.code;
               ~~~~ should have been "code".

But the more severe bug is that I got fooled by flowi member defines:
fl4_icmp_type, fl4_gre_key and fl4_dport share the same union/address.

Fix typo and make gre/icmp key setting depend on the l4 protocol.

Fixes: 7a0207094f1b ("xfrm: policy: replace session decode with flow dissector")
Reported-and-tested-by: Antony Antony <antony@phenome.org>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
net/xfrm/xfrm_policy.c