Commit 1982a2a0 authored by Guillaume Nault's avatar Guillaume Nault Committed by Steffen Klassert
Browse files

xfrm: Clear low order bits of ->flowi4_tos in decode_session4(). 



Commit 23e7b1bf ("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: 7a020709 ("xfrm: policy: replace session decode with flow dissector")
Signed-off-by: default avatarGuillaume Nault <gnault@redhat.com>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent e327b237

net/xfrm/xfrm_policy.c

+1 −1
Original line number Diff line number Diff line
@@ -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)