lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 301/320] xfrm: Dont accidentally set RTO_ONLINK in decode_session4()
    Date
    From: Guillaume Nault <gnault@redhat.com>

    commit 23e7b1bfed61e301853b5e35472820d919498278 upstream.

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/xfrm/xfrm_policy.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/net/xfrm/xfrm_policy.c
    +++ b/net/xfrm/xfrm_policy.c
    @@ -31,6 +31,7 @@
    #include <linux/if_tunnel.h>
    #include <net/dst.h>
    #include <net/flow.h>
    +#include <net/inet_ecn.h>
    #include <net/xfrm.h>
    #include <net/ip.h>
    #include <net/gre.h>
    @@ -3282,7 +3283,7 @@ decode_session4(struct sk_buff *skb, str
    fl4->flowi4_proto = iph->protocol;
    fl4->daddr = reverse ? iph->saddr : iph->daddr;
    fl4->saddr = reverse ? iph->daddr : iph->saddr;
    - fl4->flowi4_tos = iph->tos;
    + fl4->flowi4_tos = iph->tos & ~INET_ECN_MASK;

    if (!ip_is_fragment(iph)) {
    switch (iph->protocol) {

    \
     
     \ /
      Last update: 2022-01-24 21:09    [W:2.513 / U:0.372 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site