From: Steffen Klassert <steffen.klassert@secunet.com>
To: David Miller <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
Steffen Klassert <steffen.klassert@secunet.com>,
<netdev@vger.kernel.org>
Subject: [PATCH 10/10] xfrm: policy: fix layer 4 flowi decoding
Date: Sat, 28 Oct 2023 10:43:28 +0200 [thread overview]
Message-ID: <20231028084328.3119236-11-steffen.klassert@secunet.com> (raw)
In-Reply-To: <20231028084328.3119236-1-steffen.klassert@secunet.com>
From: Florian Westphal <fw@strlen.de>
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 | 26 ++++++++++++++++++++------
1 file changed, 20 insertions(+), 6 deletions(-)
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 6aea8b2f45e0..d2dddc570f4f 100644
--- 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
--
2.34.1
prev parent reply other threads:[~2023-10-28 8:43 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-28 8:43 [PATCH 0/10] pull request (net-next): ipsec-next 2023-10-28 Steffen Klassert
2023-10-28 8:43 ` [PATCH 01/10] xfrm: Remove unused function declarations Steffen Klassert
2023-10-31 20:20 ` patchwork-bot+netdevbpf
2023-10-28 8:43 ` [PATCH 02/10] xfrm: Annotate struct xfrm_sec_ctx with __counted_by Steffen Klassert
2023-10-28 8:43 ` [PATCH 03/10] xfrm: Use the XFRM_GRO to indicate a GRO call on input Steffen Klassert
2023-10-28 8:43 ` [PATCH 04/10] xfrm: Support GRO for IPv4 ESP in UDP encapsulation Steffen Klassert
2023-10-28 8:43 ` [PATCH 05/10] xfrm: Support GRO for IPv6 " Steffen Klassert
2023-10-28 8:43 ` [PATCH 06/10] xfrm: pass struct net to xfrm_decode_session wrappers Steffen Klassert
2023-10-28 8:43 ` [PATCH 07/10] xfrm: move mark and oif flowi decode into common code Steffen Klassert
2023-10-28 8:43 ` [PATCH 08/10] xfrm: policy: replace session decode with flow dissector Steffen Klassert
2023-10-28 8:43 ` [PATCH 09/10] xfrm Fix use after free in __xfrm6_udp_encap_rcv Steffen Klassert
2023-10-28 8:43 ` Steffen Klassert [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231028084328.3119236-11-steffen.klassert@secunet.com \
--to=steffen.klassert@secunet.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox