| Message ID | 73ad04e0f34b17b02d1eca263e4008440cf3b8e4.1704294322.git.gnault@redhat.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] xfrm: Clear low order bits of ->flowi4_tos in decode_session4(). | expand |
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!
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)
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(-)