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>

diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 6aea8b2f45e02440847ea94628cd39a022bace1e..d2dddc570f4f660b9651bf08d4fedab10e44a951 100644 (file)
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -3400,11 +3400,18 @@ decode_session4(const struct xfrm_flow_keys *flkeys, struct flowi *fl, bool reve
                fl4->fl4_dport = flkeys->ports.dst;
        }
 
+       switch (flkeys->basic.ip_proto) {
+       case IPPROTO_GRE:
+               fl4->fl4_gre_key = flkeys->gre.keyid;
+               break;
+       case IPPROTO_ICMP:
+               fl4->fl4_icmp_type = flkeys->icmp.type;
+               fl4->fl4_icmp_code = flkeys->icmp.code;
+               break;
+       }
+
        fl4->flowi4_proto = flkeys->basic.ip_proto;
        fl4->flowi4_tos = flkeys->ip.tos;
-       fl4->fl4_icmp_type = flkeys->icmp.type;
-       fl4->fl4_icmp_type = flkeys->icmp.code;
-       fl4->fl4_gre_key = flkeys->gre.keyid;
 }
 
 #if IS_ENABLED(CONFIG_IPV6)
@@ -3427,10 +3434,17 @@ decode_session6(const struct xfrm_flow_keys *flkeys, struct flowi *fl, bool reve
                fl6->fl6_dport = flkeys->ports.dst;
        }
 
+       switch (flkeys->basic.ip_proto) {
+       case IPPROTO_GRE:
+               fl6->fl6_gre_key = flkeys->gre.keyid;
+               break;
+       case IPPROTO_ICMPV6:
+               fl6->fl6_icmp_type = flkeys->icmp.type;
+               fl6->fl6_icmp_code = flkeys->icmp.code;
+               break;
+       }
+
        fl6->flowi6_proto = flkeys->basic.ip_proto;
-       fl6->fl6_icmp_type = flkeys->icmp.type;
-       fl6->fl6_icmp_type = flkeys->icmp.code;
-       fl6->fl6_gre_key = flkeys->gre.keyid;
 }
 #endif