From: Christian Hopps <chopps@labn.net>
To: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Christian Hopps <chopps@labn.net>,
Steffen Klassert <steffen.klassert@secunet.com>,
"David S. Miller" <davem@davemloft.net>,
devel@linux-ipsec.org, Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
netdev@vger.kernel.org, chopps@chopps.org
Subject: Re: [PATCH] xfrm: fix bug with DSCP copy to v6 from v4 tunnel
Date: Fri, 27 Jan 2023 07:31:54 -0500 [thread overview]
Message-ID: <m2h6wc16tu.fsf@ja.int.chopps.org> (raw)
In-Reply-To: <Y9Oi+np1iaRJhEY/@gondor.apana.org.au>
Herbert Xu <herbert@gondor.apana.org.au> writes:
> On Thu, Jan 26, 2023 at 05:29:34AM -0500, Christian Hopps wrote:
>> When copying the DSCP bits for decap-dscp into IPv6 don't assume the
>> outer encap is always IPv6. Instead, as with the inner IPv4 case, copy
>> the DSCP bits from the correctly saved "tos" value in the control block.
>>
>> fixes: 227620e29509 ("[IPSEC]: Separate inner/outer mode processing on input")
>
> The broken code apparently came from
>
> commit b3284df1c86f7ac078dcb8fb250fe3d6437e740c
> Author: Florian Westphal <fw@strlen.de>
> Date: Fri Mar 29 21:16:28 2019 +0100
>
> xfrm: remove input2 indirection from xfrm_mode
>
> Please fix the Fixes header.
Yes that's what the immediate git blame points at; however, that code was copied from net/ipv6/xfrm6_mode_tunnel.c:xfrm6_tunnel_input() and that code arrived in:
b59f45d0b2878 ("[IPSEC] xfrm: Abstract out encapsulation modes")
Originally this code using a different sk_buff layout was from the initial git repo checkin.
1da177e4c3f41 ("Linux-2.6.12-rc2")
Why don't I just remove the fixes line? I didn't want to include it initially anyway.
Thanks,
Chris.
>
> Thanks,
next prev parent reply other threads:[~2023-01-27 12:48 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-26 10:29 [PATCH] xfrm: fix bug with DSCP copy to v6 from v4 tunnel Christian Hopps
2023-01-26 16:33 ` [PATCH ipsec-next v2] " Christian Hopps
2023-01-27 10:37 ` Herbert Xu
2023-01-27 12:22 ` Christian Hopps
2023-01-28 1:42 ` Herbert Xu
2023-02-01 8:21 ` Steffen Klassert
2023-01-27 10:10 ` [PATCH] " Herbert Xu
2023-01-27 12:31 ` Christian Hopps [this message]
2023-01-28 1:41 ` Herbert Xu
2023-01-27 22:58 ` [PATCH ipsec-next v3] " Christian Hopps
2023-01-28 1:38 ` Herbert Xu
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=m2h6wc16tu.fsf@ja.int.chopps.org \
--to=chopps@labn.net \
--cc=chopps@chopps.org \
--cc=davem@davemloft.net \
--cc=devel@linux-ipsec.org \
--cc=edumazet@google.com \
--cc=herbert@gondor.apana.org.au \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--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).