* [PATCH net] xfrm: Clear low order bits of ->flowi4_tos in decode_session4().
@ 2024-01-03 15:06 Guillaume Nault
2024-01-17 7:22 ` Steffen Klassert
0 siblings, 1 reply; 2+ messages in thread
From: Guillaume Nault @ 2024-01-03 15:06 UTC (permalink / raw)
To: David Miller, Jakub Kicinski, Paolo Abeni, Eric Dumazet
Cc: netdev, Florian Westphal, Simon Horman, Herbert Xu,
Steffen Klassert
Commit 23e7b1bfed61 ("xfrm: Don't accidentally set RTO_ONLINK in
decode_session4()") fixed a problem where decode_session4() could
erroneously set the RTO_ONLINK flag for IPv4 route lookups. This
problem was reintroduced when decode_session4() was modified to
use the flow dissector.
Fix this by clearing again the two low order bits of ->flowi4_tos.
Found by code inspection, compile tested only.
Fixes: 7a0207094f1b ("xfrm: policy: replace session decode with flow dissector")
Signed-off-by: Guillaume Nault <gnault@redhat.com>
---
net/xfrm/xfrm_policy.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index c13dc3ef7910..e69d588caa0c 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -3416,7 +3416,7 @@ decode_session4(const struct xfrm_flow_keys *flkeys, struct flowi *fl, bool reve
}
fl4->flowi4_proto = flkeys->basic.ip_proto;
- fl4->flowi4_tos = flkeys->ip.tos;
+ fl4->flowi4_tos = flkeys->ip.tos & ~INET_ECN_MASK;
}
#if IS_ENABLED(CONFIG_IPV6)
--
2.39.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net] xfrm: Clear low order bits of ->flowi4_tos in decode_session4().
2024-01-03 15:06 [PATCH net] xfrm: Clear low order bits of ->flowi4_tos in decode_session4() Guillaume Nault
@ 2024-01-17 7:22 ` Steffen Klassert
0 siblings, 0 replies; 2+ messages in thread
From: Steffen Klassert @ 2024-01-17 7:22 UTC (permalink / raw)
To: Guillaume Nault
Cc: David Miller, Jakub Kicinski, Paolo Abeni, Eric Dumazet, netdev,
Florian Westphal, Simon Horman, Herbert Xu
On Wed, Jan 03, 2024 at 04:06:32PM +0100, Guillaume Nault wrote:
> Commit 23e7b1bfed61 ("xfrm: Don't accidentally set RTO_ONLINK in
> decode_session4()") fixed a problem where decode_session4() could
> erroneously set the RTO_ONLINK flag for IPv4 route lookups. This
> problem was reintroduced when decode_session4() was modified to
> use the flow dissector.
>
> Fix this by clearing again the two low order bits of ->flowi4_tos.
> Found by code inspection, compile tested only.
>
> Fixes: 7a0207094f1b ("xfrm: policy: replace session decode with flow dissector")
> Signed-off-by: Guillaume Nault <gnault@redhat.com>
Applied, thanks a lot!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-01-17 7:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-03 15:06 [PATCH net] xfrm: Clear low order bits of ->flowi4_tos in decode_session4() Guillaume Nault
2024-01-17 7:22 ` Steffen Klassert
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).