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: 4bdc3d66147b ("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>

2 files changed, 2 insertions, 2 deletions

diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 644af510d932..59bc180b02d8 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -828,7 +828,7 @@ lookup:
                 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) {
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index 68831931b1fe..d9cc731f2619 100644
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -686,7 +686,7 @@ lookup:
                 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) {