Commit 6be49dea authored by Jason Xing's avatar Jason Xing Committed by Paolo Abeni
Browse files

rstreason: prepare for passive reset 



Adjust the parameter and support passing reason of reset which
is for now NOT_SPECIFIED. No functional changes.

Signed-off-by: default avatarJason Xing <kernelxing@tencent.com>
Acked-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 5cb2cb3c

include/net/request_sock.h

+3 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/refcount.h>



#include <net/sock.h>

#include <net/rstreason.h>



struct request_sock;

struct sk_buff;
@@ -34,7 +35,8 @@ struct request_sock_ops { 
	void		(*send_ack)(const struct sock *sk, struct sk_buff *skb,

				    struct request_sock *req);

	void		(*send_reset)(const struct sock *sk,

				      struct sk_buff *skb);

				      struct sk_buff *skb,

				      enum sk_rst_reason reason);

	void		(*destructor)(struct request_sock *req);

	void		(*syn_ack_timeout)(const struct request_sock *req);

};

net/dccp/ipv4.c

+6 −4
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <net/xfrm.h>

#include <net/secure_seq.h>

#include <net/netns/generic.h>

#include <net/rstreason.h>



#include "ackvec.h"

#include "ccid.h"
@@ -521,7 +522,8 @@ static int dccp_v4_send_response(const struct sock *sk, struct request_sock *req 
	return err;

}



static void dccp_v4_ctl_send_reset(const struct sock *sk, struct sk_buff *rxskb)

static void dccp_v4_ctl_send_reset(const struct sock *sk, struct sk_buff *rxskb,

				   enum sk_rst_reason reason)

{

	int err;

	const struct iphdr *rxiph;
@@ -706,7 +708,7 @@ int dccp_v4_do_rcv(struct sock *sk, struct sk_buff *skb) 
	return 0;



reset:

	dccp_v4_ctl_send_reset(sk, skb);

	dccp_v4_ctl_send_reset(sk, skb, SK_RST_REASON_NOT_SPECIFIED);

	kfree_skb(skb);

	return 0;

}
@@ -869,7 +871,7 @@ static int dccp_v4_rcv(struct sk_buff *skb) 
		if (nsk == sk) {

			reqsk_put(req);

		} else if (dccp_child_process(sk, nsk, skb)) {

			dccp_v4_ctl_send_reset(sk, skb);

			dccp_v4_ctl_send_reset(sk, skb, SK_RST_REASON_NOT_SPECIFIED);

			goto discard_and_relse;

		} else {

			sock_put(sk);
@@ -909,7 +911,7 @@ static int dccp_v4_rcv(struct sk_buff *skb) 
	if (dh->dccph_type != DCCP_PKT_RESET) {

		DCCP_SKB_CB(skb)->dccpd_reset_code =

					DCCP_RESET_CODE_NO_CONNECTION;

		dccp_v4_ctl_send_reset(sk, skb);

		dccp_v4_ctl_send_reset(sk, skb, SK_RST_REASON_NOT_SPECIFIED);

	}



discard_it:

net/dccp/ipv6.c

+6 −4
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <net/secure_seq.h>

#include <net/netns/generic.h>

#include <net/sock.h>

#include <net/rstreason.h>



#include "dccp.h"

#include "ipv6.h"
@@ -256,7 +257,8 @@ static void dccp_v6_reqsk_destructor(struct request_sock *req) 
	kfree_skb(inet_rsk(req)->pktopts);

}



static void dccp_v6_ctl_send_reset(const struct sock *sk, struct sk_buff *rxskb)

static void dccp_v6_ctl_send_reset(const struct sock *sk, struct sk_buff *rxskb,

				   enum sk_rst_reason reason)

{

	const struct ipv6hdr *rxip6h;

	struct sk_buff *skb;
@@ -656,7 +658,7 @@ static int dccp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) 
	return 0;



reset:

	dccp_v6_ctl_send_reset(sk, skb);

	dccp_v6_ctl_send_reset(sk, skb, SK_RST_REASON_NOT_SPECIFIED);

discard:

	if (opt_skb != NULL)

		__kfree_skb(opt_skb);
@@ -762,7 +764,7 @@ static int dccp_v6_rcv(struct sk_buff *skb) 
		if (nsk == sk) {

			reqsk_put(req);

		} else if (dccp_child_process(sk, nsk, skb)) {

			dccp_v6_ctl_send_reset(sk, skb);

			dccp_v6_ctl_send_reset(sk, skb, SK_RST_REASON_NOT_SPECIFIED);

			goto discard_and_relse;

		} else {

			sock_put(sk);
@@ -801,7 +803,7 @@ static int dccp_v6_rcv(struct sk_buff *skb) 
	if (dh->dccph_type != DCCP_PKT_RESET) {

		DCCP_SKB_CB(skb)->dccpd_reset_code =

					DCCP_RESET_CODE_NO_CONNECTION;

		dccp_v6_ctl_send_reset(sk, skb);

		dccp_v6_ctl_send_reset(sk, skb, SK_RST_REASON_NOT_SPECIFIED);

	}



discard_it:

net/dccp/minisocks.c

+2 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <net/sock.h>

#include <net/xfrm.h>

#include <net/inet_timewait_sock.h>

#include <net/rstreason.h>



#include "ackvec.h"

#include "ccid.h"
@@ -202,7 +203,7 @@ struct sock *dccp_check_req(struct sock *sk, struct sk_buff *skb, 
	DCCP_SKB_CB(skb)->dccpd_reset_code = DCCP_RESET_CODE_TOO_BUSY;

drop:

	if (dccp_hdr(skb)->dccph_type != DCCP_PKT_RESET)

		req->rsk_ops->send_reset(sk, skb);

		req->rsk_ops->send_reset(sk, skb, SK_RST_REASON_NOT_SPECIFIED);



	inet_csk_reqsk_queue_drop(sk, req);

out:

net/ipv4/tcp_ipv4.c

+7 −5
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ 
#include <net/xfrm.h>

#include <net/secure_seq.h>

#include <net/busy_poll.h>

#include <net/rstreason.h>



#include <linux/inet.h>

#include <linux/ipv6.h>
@@ -723,7 +724,8 @@ static bool tcp_v4_ao_sign_reset(const struct sock *sk, struct sk_buff *skb, 
 *	Exception: precedence violation. We do not implement it in any case.

 */



static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb)

static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb,

			      enum sk_rst_reason reason)

{

	const struct tcphdr *th = tcp_hdr(skb);

	struct {
@@ -1934,7 +1936,7 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb) 
	return 0;



reset:

	tcp_v4_send_reset(rsk, skb);

	tcp_v4_send_reset(rsk, skb, SK_RST_REASON_NOT_SPECIFIED);

discard:

	kfree_skb_reason(skb, reason);

	/* Be careful here. If this function gets more complicated and
@@ -2285,7 +2287,7 @@ int tcp_v4_rcv(struct sk_buff *skb) 
		} else {

			drop_reason = tcp_child_process(sk, nsk, skb);

			if (drop_reason) {

				tcp_v4_send_reset(nsk, skb);

				tcp_v4_send_reset(nsk, skb, SK_RST_REASON_NOT_SPECIFIED);

				goto discard_and_relse;

			}

			sock_put(sk);
@@ -2364,7 +2366,7 @@ int tcp_v4_rcv(struct sk_buff *skb) 
bad_packet:

		__TCP_INC_STATS(net, TCP_MIB_INERRS);

	} else {

		tcp_v4_send_reset(NULL, skb);

		tcp_v4_send_reset(NULL, skb, SK_RST_REASON_NOT_SPECIFIED);

	}



discard_it:
@@ -2416,7 +2418,7 @@ int tcp_v4_rcv(struct sk_buff *skb) 
		tcp_v4_timewait_ack(sk, skb);

		break;

	case TCP_TW_RST:

		tcp_v4_send_reset(sk, skb);

		tcp_v4_send_reset(sk, skb, SK_RST_REASON_NOT_SPECIFIED);

		inet_twsk_deschedule_put(inet_twsk(sk));

		goto discard_it;

	case TCP_TW_SUCCESS:;