diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2007-10-18 05:15:57 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-10-18 05:15:57 -0700 |
| commit | bd0bf57700cb0eaa92f3d2ee040a69743cdd99d0 (patch) | |
| tree | 0233529f1a744599e46799050060ab6f65fecffd /net | |
| parent | 04028045a12ba941c579d0f3238489333ac18ea4 (diff) | |
| download | linux-bd0bf57700cb0eaa92f3d2ee040a69743cdd99d0.tar.gz linux-bd0bf57700cb0eaa92f3d2ee040a69743cdd99d0.tar.bz2 linux-bd0bf57700cb0eaa92f3d2ee040a69743cdd99d0.zip | |
[IPV6]: Lost locking in fl6_sock_lookup
This routine scans the ipv6_fl_list whose update is
protected with the socket lock and the ip6_sk_fl_lock.
Since the socket lock is not taken in the lookup, use
the other one.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/ip6_flowlabel.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c index 8550df20f984..f40a08669db0 100644 --- a/net/ipv6/ip6_flowlabel.c +++ b/net/ipv6/ip6_flowlabel.c @@ -190,14 +190,17 @@ struct ip6_flowlabel * fl6_sock_lookup(struct sock *sk, __be32 label) label &= IPV6_FLOWLABEL_MASK; + read_lock_bh(&ip6_sk_fl_lock); 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); return fl; } } + read_unlock_bh(&ip6_sk_fl_lock); return NULL; } |