• Florian Westphal's avatar
    xfrm: policy: fix reinsertion on node merge · 1d38900c
    Florian Westphal authored
    "newpos" has wrong scope.  It must be NULL on each iteration of the loop.
    Otherwise, when policy is to be inserted at the start, we would instead
    insert at point found by the previous loop-iteration instead.
    
    Also, we need to unlink the policy before we reinsert it to the new node,
    else we can get next-points-to-self loops.
    
    Because policies are only ordered by priority it is irrelevant which policy
    is "more recent" except when two policies have same priority.
    (the more recent one is placed after the older one).
    
    In these cases, we can use the ->pos id number to know which one is the
    'older': the higher the id, the more recent the policy.
    
    So we only need to unlink all policies from the node that is about to be
    removed, and insert them to the replacement node.
    
    Fixes: 9cf545eb ("xfrm: policy: store inexact policies in a tree ordered by destination address")
    Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
    Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
    1d38900c
xfrm_policy.c 101 KB