From: Antony Antony <antony.antony@secunet.com>
To: Florian Westphal <fw@strlen.de>
Cc: Antony Antony <antony@phenome.org>,
Steffen Klassert <steffen.klassert@secunet.com>,
<netdev@vger.kernel.org>, <herbert@gondor.apana.org.au>
Subject: Re: [PATCH ipsec-next v3 0/3] xfrm: policy: replace session decode with flow dissector
Date: Thu, 26 Oct 2023 16:33:22 +0200 [thread overview]
Message-ID: <ZTp4dDaWejic16eT@moon.secunet.de> (raw)
In-Reply-To: <20231026125748.GA22233@breakpoint.cc>
On Thu, Oct 26, 2023 at 14:57:48 +0200, Florian Westphal wrote:
> Antony Antony <antony@phenome.org> wrote:
> > > > Florian Westphal (3):
> > > > xfrm: pass struct net to xfrm_decode_session wrappers
> > > > xfrm: move mark and oif flowi decode into common code
> > > > xfrm: policy: replace session decode with flow dissector
> > >
> > > Series applied, thanks a lot Florian!
> > >
> >
> > Hi Steffen,
> >
> > I would like to report a potential bug that I've encountered while working
>
> s/potential//
>
> Does this patch make things work for you again? Thanks!
>
> diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
> index 6aea8b2f45e0..e8c406eba11b 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_ICMP:
> + 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
>
Tested-by: Antony Antony <antony.antony@secunet.com>
Thanks,
-antony
next prev parent reply other threads:[~2023-10-26 14:33 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-04 16:09 [PATCH ipsec-next v3 0/3] xfrm: policy: replace session decode with flow dissector Florian Westphal
2023-10-04 16:09 ` [PATCH ipsec-next v3 1/3] xfrm: pass struct net to xfrm_decode_session wrappers Florian Westphal
2023-10-05 12:05 ` Simon Horman
2023-10-04 16:09 ` [PATCH ipsec-next v3 2/3] xfrm: move mark and oif flowi decode into common code Florian Westphal
2023-10-04 16:09 ` [PATCH ipsec-next v3 3/3] xfrm: policy: replace session decode with flow dissector Florian Westphal
2023-10-10 7:51 ` [PATCH ipsec-next v3 0/3] " Steffen Klassert
2023-10-26 12:12 ` Antony Antony
2023-10-26 12:57 ` Florian Westphal
2023-10-26 14:33 ` Antony Antony [this message]
2023-10-26 14:36 ` [PATCH ipsec-next] xfrm: policy: fix layer 4 flowi decoding Florian Westphal
2023-10-26 14:38 ` Florian Westphal
2023-10-26 14:45 ` [PATCH ipsec-next v2] " Florian Westphal
2023-10-28 8:31 ` Steffen Klassert
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=ZTp4dDaWejic16eT@moon.secunet.de \
--to=antony.antony@secunet.com \
--cc=antony@phenome.org \
--cc=fw@strlen.de \
--cc=herbert@gondor.apana.org.au \
--cc=netdev@vger.kernel.org \
--cc=steffen.klassert@secunet.com \
/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;
as well as URLs for NNTP newsgroup(s).