xfrm: Don't accidentally set RTO_ONLINK in decode_session4()
authorGuillaume Nault <gnault@redhat.com>
Mon, 10 Jan 2022 13:43:06 +0000 (14:43 +0100)
committerJakub Kicinski <kuba@kernel.org>
Wed, 12 Jan 2022 04:36:08 +0000 (20:36 -0800)
commit23e7b1bfed61e301853b5e35472820d919498278
tree549b4fea8308a48d1b0030edc194f9b2f3cf12cc
parent274c224062ff9545d8df2a6e4764a5fd660d792e
xfrm: Don't accidentally set RTO_ONLINK in decode_session4()

Similar to commit 94e2238969e8 ("xfrm4: strip ECN bits from tos field"),
clear the ECN bits from iph->tos when setting ->flowi4_tos.
This ensures that the last bit of ->flowi4_tos is cleared, so
ip_route_output_key_hash() isn't going to restrict the scope of the
route lookup.

Use ~INET_ECN_MASK instead of IPTOS_RT_MASK, because we have no reason
to clear the high order bits.

Found by code inspection, compile tested only.

Fixes: 4da3089f2b58 ("[IPSEC]: Use TOS when doing tunnel lookups")
Signed-off-by: Guillaume Nault <gnault@redhat.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/xfrm/xfrm_policy.c