iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

inet: prepare sock_edemux() & sock_gen_put() for new SYN_RECV state

Browse Source 
sock_edemux() & sock_gen_put() should be ready to cope with request socks.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet
2015-03-12 16:44:08 -07:00
committed by David S. Miller
parent 0159dfd3d7
commit 41b822c59e
4 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/net/request_sock.h
View File

@ -77,6 +77,11 @@ static inline struct request_sock *reqsk_alloc(const struct request_sock_ops *op
return req; return req;
} }
static inline struct request_sock *inet_reqsk(struct sock *sk)
{
return (struct request_sock *)sk;
}
static inline void __reqsk_free(struct request_sock *req) static inline void __reqsk_free(struct request_sock *req)
{ {
kmem_cache_free(req->rsk_ops->slab, req); kmem_cache_free(req->rsk_ops->slab, req);

2
include/net/sock.h
View File

@ -1625,7 +1625,7 @@ static inline void sock_put(struct sock *sk)
sk_free(sk); sk_free(sk);
} }
/* Generic version of sock_put(), dealing with all sockets /* Generic version of sock_put(), dealing with all sockets
* (TCP_TIMEWAIT, ESTABLISHED...) * (TCP_TIMEWAIT, TCP_NEW_SYN_RECV, ESTABLISHED...)
*/ */
void sock_gen_put(struct sock *sk); void sock_gen_put(struct sock *sk);

2
net/core/sock.c
View File

@ -1668,6 +1668,8 @@ void sock_edemux(struct sk_buff *skb)
if (sk->sk_state == TCP_TIME_WAIT) if (sk->sk_state == TCP_TIME_WAIT)
inet_twsk_put(inet_twsk(sk)); inet_twsk_put(inet_twsk(sk));
else if (sk->sk_state == TCP_NEW_SYN_RECV)
reqsk_put(inet_reqsk(sk));
else else
sock_put(sk); sock_put(sk);
} }

2
net/ipv4/inet_hashtables.c
View File

@ -262,6 +262,8 @@ void sock_gen_put(struct sock *sk)
if (sk->sk_state == TCP_TIME_WAIT) if (sk->sk_state == TCP_TIME_WAIT)
inet_twsk_free(inet_twsk(sk)); inet_twsk_free(inet_twsk(sk));
else if (sk->sk_state == TCP_NEW_SYN_RECV)
reqsk_free(inet_reqsk(sk));
else else
sk_free(sk); sk_free(sk);
} }