diff options
| author |   Pavel Emelyanov <xemul@openvz.org> | 2007-10-18 05:38:48 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2007-10-18 05:38:48 -0700 |
| commit | 52f095ee88d8851866bc7694ab991ca5abf21d5e (patch) | |
| tree | 803f93f81cbdffc107377829531ab2afd88e9e62 /net/ipv6 | |
| parent | [NETFILTER]: nf_conntrack_tcp: fix connection reopening fix (diff) | |
| download | linux-dev-52f095ee88d8851866bc7694ab991ca5abf21d5e.tar.xz linux-dev-52f095ee88d8851866bc7694ab991ca5abf21d5e.zip | |
[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>
Diffstat (limited to 'net/ipv6')
| -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) 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; } } |