summaryrefslogtreecommitdiff
path: root/net/key
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2008-11-25 17:21:01 -0800
committerDavid S. Miller <davem@davemloft.net>2008-11-25 17:21:01 -0800
commit50a30657fd7ee77a94a6bf0ad86eba7c37c3032e (patch)
tree7eb9165881b9082588eb2c373e9ed2ebc013321e /net/key
parentc78371441c0d957f54c9f8a35b3ee5a378d14808 (diff)
downloadlinux-3.10-50a30657fd7ee77a94a6bf0ad86eba7c37c3032e.tar.gz
linux-3.10-50a30657fd7ee77a94a6bf0ad86eba7c37c3032e.tar.bz2
linux-3.10-50a30657fd7ee77a94a6bf0ad86eba7c37c3032e.zip
netns xfrm: per-netns km_waitq
Disallow spurious wakeups in __xfrm_lookup(). Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/key')
-rw-r--r--net/key/af_key.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c
index bde8aad4cc9..f202ba6c8dc 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -1411,7 +1411,7 @@ static int pfkey_acquire(struct sock *sk, struct sk_buff *skb, struct sadb_msg *
spin_lock_bh(&x->lock);
if (x->km.state == XFRM_STATE_ACQ) {
x->km.state = XFRM_STATE_ERROR;
- wake_up(&km_waitq);
+ wake_up(&init_net.xfrm.km_waitq);
}
spin_unlock_bh(&x->lock);
xfrm_state_put(x);