p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tcp/dccp: add inet_csk_reqsk_queue_drop_and_put() helper 

Let's reduce the confusion about inet_csk_reqsk_queue_drop() :
In many cases we also need to release reference on request socket,
so add a helper to do this, reducing code size and complexity.

Fixes: 4bdc3d6614 ("tcp/dccp: fix behavior of stale SYN_RECV request sockets")
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-10-14 11:16:27 -07:00 committed by David S. Miller
parent ef84d8ce5a
commit f03f2e154f
6 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/inet_connection_sock.h
View File

@ -299,6 +299,7 @@ static inline int inet_csk_reqsk_queue_is_full(const struct sock *sk)
}
void inet_csk_reqsk_queue_drop(struct sock *sk, struct request_sock *req);
void inet_csk_reqsk_queue_drop_and_put(struct sock *sk, struct request_sock *req);
void inet_csk_destroy_sock(struct sock *sk);
void inet_csk_prepare_forced_close(struct sock *sk);

2
net/dccp/ipv4.c
View File

@ -828,7 +828,7 @@ static int dccp_v4_rcv(struct sk_buff *skb)
if (likely(sk->sk_state == DCCP_LISTEN)) {
nsk = dccp_check_req(sk, skb, req);
} else {
inet_csk_reqsk_queue_drop(sk, req);
inet_csk_reqsk_queue_drop_and_put(sk, req);
goto lookup;
}
if (!nsk) {

2
net/dccp/ipv6.c
View File

@ -686,7 +686,7 @@ static int dccp_v6_rcv(struct sk_buff *skb)
if (likely(sk->sk_state == DCCP_LISTEN)) {
nsk = dccp_check_req(sk, skb, req);
} else {
inet_csk_reqsk_queue_drop(sk, req);
inet_csk_reqsk_queue_drop_and_put(sk, req);
goto lookup;
}
if (!nsk) {

10
net/ipv4/inet_connection_sock.c
View File

@ -546,6 +546,13 @@ void inet_csk_reqsk_queue_drop(struct sock *sk, struct request_sock *req)
}
EXPORT_SYMBOL(inet_csk_reqsk_queue_drop);
void inet_csk_reqsk_queue_drop_and_put(struct sock *sk, struct request_sock *req)
{
inet_csk_reqsk_queue_drop(sk, req);
reqsk_put(req);
}
EXPORT_SYMBOL(inet_csk_reqsk_queue_drop_and_put);
static void reqsk_timer_handler(unsigned long data)
{
struct request_sock *req = (struct request_sock *)data;
@ -608,8 +615,7 @@ static void reqsk_timer_handler(unsigned long data)
return;
}
drop:
inet_csk_reqsk_queue_drop(sk_listener, req);
reqsk_put(req);
inet_csk_reqsk_queue_drop_and_put(sk_listener, req);
}
static void reqsk_queue_hash_req(struct request_sock *req,

2
net/ipv4/tcp_ipv4.c
View File

@ -1591,7 +1591,7 @@ int tcp_v4_rcv(struct sk_buff *skb)
if (likely(sk->sk_state == TCP_LISTEN)) {
nsk = tcp_check_req(sk, skb, req, false);
} else {
inet_csk_reqsk_queue_drop(sk, req);
inet_csk_reqsk_queue_drop_and_put(sk, req);
goto lookup;
}
if (!nsk) {

2
net/ipv6/tcp_ipv6.c
View File

@ -1386,7 +1386,7 @@ static int tcp_v6_rcv(struct sk_buff *skb)
if (likely(sk->sk_state == TCP_LISTEN)) {
nsk = tcp_check_req(sk, skb, req, false);
} else {
inet_csk_reqsk_queue_drop(sk, req);
inet_csk_reqsk_queue_drop_and_put(sk, req);
goto lookup;
}
if (!nsk) {