diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2007-10-18 08:38:48 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-10-18 08:38:48 -0400 |
commit | 52f095ee88d8851866bc7694ab991ca5abf21d5e (patch) | |
tree | 803f93f81cbdffc107377829531ab2afd88e9e62 | |
parent | bc34b841556aad437baf4199744e55500bfa2088 (diff) |
[IPV6]: Fix again the fl6_sock_lookup() fixed locking
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>
-rw-r--r-- | net/ipv6/ip6_flowlabel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c index e55ae1a1f560..b12cc22e7745 100644 --- a/net/ipv6/ip6_flowlabel.c +++ b/net/ipv6/ip6_flowlabel.c | |||
@@ -210,9 +210,9 @@ struct ip6_flowlabel * fl6_sock_lookup(struct sock *sk, __be32 label) | |||
210 | for (sfl=np->ipv6_fl_list; sfl; sfl = sfl->next) { | 210 | for (sfl=np->ipv6_fl_list; sfl; sfl = sfl->next) { |
211 | struct ip6_flowlabel *fl = sfl->fl; | 211 | struct ip6_flowlabel *fl = sfl->fl; |
212 | if (fl->label == label) { | 212 | if (fl->label == label) { |
213 | read_unlock_bh(&ip6_sk_fl_lock); | ||
214 | fl->lastuse = jiffies; | 213 | fl->lastuse = jiffies; |
215 | atomic_inc(&fl->users); | 214 | atomic_inc(&fl->users); |
215 | read_unlock_bh(&ip6_sk_fl_lock); | ||
216 | return fl; | 216 | return fl; |
217 | } | 217 | } |
218 | } | 218 | } |