diff options
| author |   Eric Dumazet <edumazet@google.com> | 2015-03-17 18:32:31 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-03-17 22:02:29 -0400 |
| commit | 0470c8ca1d57927f2cc3e1d5add1fb2834609447 (patch) | |
| tree | 798f475f48fbdff0eae359c3f345a1a0eaf83ca2 /net/ipv6/syncookies.c | |
| parent | inet: avoid fastopen lock for regular accept() (diff) | |
| download | linux-dev-0470c8ca1d57927f2cc3e1d5add1fb2834609447.tar.xz linux-dev-0470c8ca1d57927f2cc3e1d5add1fb2834609447.zip | |
inet: fix request sock refcounting
While testing last patch series, I found req sock refcounting was wrong.
We must set skc_refcnt to 1 for all request socks added in hashes,
but also on request sockets created by FastOpen or syncookies.
It is tricky because we need to defer this initialization so that
future RCU lookups do not try to take a refcount on a not yet
fully initialized request socket.
Also get rid of ireq_refcnt alias.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Fixes: 13854e5a6046 ("inet: add proper refcounting to request sock")
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/syncookies.c')
| -rw-r--r-- | net/ipv6/syncookies.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/ipv6/syncookies.c b/net/ipv6/syncookies.c index 1ef0c926ce9d..da5823e5e5a7 100644 --- a/net/ipv6/syncookies.c +++ b/net/ipv6/syncookies.c @@ -49,11 +49,12 @@ static inline struct sock *get_cookie_sock(struct sock *sk, struct sk_buff *skb, struct sock *child; child = icsk->icsk_af_ops->syn_recv_sock(sk, skb, req, dst); - if (child) + if (child) { + atomic_set(&req->rsk_refcnt, 1); inet_csk_reqsk_queue_add(sk, req, child); - else + } else { reqsk_free(req); - + } return child; } |