Skip to content

Commit

Permalink
[IPV6]: Fix race in route selection.
Browse files Browse the repository at this point in the history
We eliminated rt6_dflt_lock (to protect default router pointer)
at 2.6.17-rc1, and introduced rt6_select() for general router selection.
The function is called in the context of rt6_lock read-lock held,
but this means, we have some race conditions when we do round-robin.

Signed-off-by; YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
YOSHIFUJI Hideaki authored and David S. Miller committed Apr 30, 2006
1 parent e959d81 commit c302e6d
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion net/ipv6/route.c
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ static struct rt6_info *rt6_select(struct rt6_info **head, int oif,
__FUNCTION__, head, head ? *head : NULL, oif);

for (rt = rt0, metric = rt0->rt6i_metric;
rt && rt->rt6i_metric == metric;
rt && rt->rt6i_metric == metric && (!last || rt != rt0);
rt = rt->u.next) {
int m;

Expand All @@ -343,9 +343,12 @@ static struct rt6_info *rt6_select(struct rt6_info **head, int oif,
(strict & RT6_SELECT_F_REACHABLE) &&
last && last != rt0) {
/* no entries matched; do round-robin */
static spinlock_t lock = SPIN_LOCK_UNLOCKED;
spin_lock(&lock);
*head = rt0->u.next;
rt0->u.next = last->u.next;
last->u.next = rt0;
spin_unlock(&lock);
}

RT6_TRACE("%s() => %p, score=%d\n",
Expand Down

0 comments on commit c302e6d

Please sign in to comment.