]> err.no Git - linux-2.6/commitdiff
[IPV6]: Fix again the fl6_sock_lookup() fixed locking
authorPavel Emelyanov <xemul@openvz.org>
Thu, 18 Oct 2007 12:38:48 +0000 (05:38 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 18 Oct 2007 12:38:48 +0000 (05:38 -0700)
YOSHIFUJI fairly pointed out, that the users increment should
be done under the ip6_sk_fl_lock not to give IPV6_FL_A_PUT a
chance to put this count to zero and release the flowlabel.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/ip6_flowlabel.c

index e55ae1a1f56023b12775e49d99cd32aec4b85dee..b12cc22e7745d4f629a1abe1871cfce161e551aa 100644 (file)
@@ -210,9 +210,9 @@ struct ip6_flowlabel * fl6_sock_lookup(struct sock *sk, __be32 label)
        for (sfl=np->ipv6_fl_list; sfl; sfl = sfl->next) {
                struct ip6_flowlabel *fl = sfl->fl;
                if (fl->label == label) {
-                       read_unlock_bh(&ip6_sk_fl_lock);
                        fl->lastuse = jiffies;
                        atomic_inc(&fl->users);
+                       read_unlock_bh(&ip6_sk_fl_lock);
                        return fl;
                }
        }