ipv6 flowlabel: Ensure to take lock when modifying np->ip6_sk_fl_list.
authorYOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org>
Wed, 30 Jan 2013 09:26:42 +0000 (09:26 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 31 Jan 2013 03:41:12 +0000 (22:41 -0500)
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/ip6_flowlabel.c

index 29124b7..5d767f1 100644 (file)
@@ -255,10 +255,19 @@ void fl6_free_socklist(struct sock *sk)
        struct ipv6_pinfo *np = inet6_sk(sk);
        struct ipv6_fl_socklist *sfl;
 
-       while ((sfl = np->ipv6_fl_list) != NULL) {
-               np->ipv6_fl_list = sfl->next;
+       if (!np->ipv6_fl_list)
+               return;
+
+       write_lock_bh(&ipv6_sk_fl_lock);
+       sfl = np->ipv6_fl_list;
+       np->ipv6_fl_list = NULL;
+       write_unlock_bh(&ipv6_sk_fl_lock);
+
+       while (sfl) {
+               struct ipv6_fl_socklist *next = sfl->next;
                fl_release(sfl->fl);
                kfree(sfl);
+               sfl = next;
        }
 }