Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65c9410c authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

tcp: Namespace-ify sysctl_tcp_abort_on_overflow 



Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 625357aa

include/net/netns/ipv4.h

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ struct netns_ipv4 { 
	int sysctl_tcp_retrans_collapse;

	int sysctl_tcp_stdurg;

	int sysctl_tcp_rfc1337;

	int sysctl_tcp_abort_on_overflow;

	struct inet_timewait_death_row tcp_death_row;

	int sysctl_max_syn_backlog;

	int sysctl_tcp_fastopen;

include/net/tcp.h

+0 −1
Original line number Diff line number Diff line
@@ -243,7 +243,6 @@ void tcp_time_wait(struct sock *sk, int state, int timeo); 




/* sysctl variables for tcp */

extern int sysctl_tcp_abort_on_overflow;

extern int sysctl_tcp_max_orphans;

extern int sysctl_tcp_fack;

extern int sysctl_tcp_reordering;

net/ipv4/sysctl_net_ipv4.c

+7 −7
Original line number Diff line number Diff line
@@ -393,13 +393,6 @@ static struct ctl_table ipv4_table[] = { 
		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "tcp_abort_on_overflow",

		.data		= &sysctl_tcp_abort_on_overflow,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "inet_peer_threshold",

		.data		= &inet_peer_threshold,
@@ -1145,6 +1138,13 @@ static struct ctl_table ipv4_net_table[] = { 
		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "tcp_abort_on_overflow",

		.data		= &init_net.ipv4.sysctl_tcp_abort_on_overflow,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{ }

};

net/ipv4/tcp_minisocks.c

+1 −3
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ 
#include <net/xfrm.h>

#include <net/busy_poll.h>



int sysctl_tcp_abort_on_overflow __read_mostly;



static bool tcp_in_window(u32 seq, u32 end_seq, u32 s_win, u32 e_win)

{

	if (seq == s_win)
@@ -783,7 +781,7 @@ struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb, 
	return inet_csk_complete_hashdance(sk, child, req, own_req);



listen_overflow:

	if (!sysctl_tcp_abort_on_overflow) {

	if (!sock_net(sk)->ipv4.sysctl_tcp_abort_on_overflow) {

		inet_rsk(req)->acked = 1;

		return NULL;

	}