Subject: Re: [PATCH] xfrm: fix bug with DSCP copy to v6 from v4 tunnel

From: Christian Hopps <[email-masked]>
Date: Fri, 27 Jan 2023 07:31:54 -0500

Herbert Xu <[email-masked]> 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 <[email-masked]>
> 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,