| Message ID | 20230127225821.1909363-1-chopps@chopps.org (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [ipsec-next,v3] xfrm: fix bug with DSCP copy to v6 from v4 tunnel | expand |
On Fri, Jan 27, 2023 at 05:58:20PM -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. > > Signed-off-by: Christian Hopps <chopps@labn.net> > --- > net/xfrm/xfrm_input.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) Acked-by: Herbert Xu <herbert@gondor.apana.org.au> Thanks!
diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c index c06e54a10540..436d29640ac2 100644 --- a/net/xfrm/xfrm_input.c +++ b/net/xfrm/xfrm_input.c @@ -279,8 +279,7 @@ static int xfrm6_remove_tunnel_encap(struct xfrm_state *x, struct sk_buff *skb) goto out; if (x->props.flags & XFRM_STATE_DECAP_DSCP) - ipv6_copy_dscp(ipv6_get_dsfield(ipv6_hdr(skb)), - ipipv6_hdr(skb)); + ipv6_copy_dscp(XFRM_MODE_SKB_CB(skb)->tos, ipipv6_hdr(skb)); if (!(x->props.flags & XFRM_STATE_NOECN)) ipip6_ecn_decapsulate(skb);
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. Signed-off-by: Christian Hopps <chopps@labn.net> --- net/xfrm/xfrm_input.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)