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

Commit 064b5bba authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Linus Torvalds
Browse files

sysctl: remove broken netfilter binary sysctls 



No one has bothered to set strategy routine for the the netfilter sysctls that
return jiffies to be sysctl_jiffies.

So it appears the sys_sysctl path is unused and untested, so this patch
removes the binary sysctl numbers.

Which fixes the netfilter oops in 2.6.23-rc2-mm2 for me.

Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Cc: Patrick McHardy <kaber@trash.net>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 35834ca1

net/ipv4/netfilter/nf_conntrack_proto_icmp.c

+0 −2
Original line number Diff line number Diff line
@@ -281,7 +281,6 @@ static int icmp_nlattr_to_tuple(struct nlattr *tb[], 
static struct ctl_table_header *icmp_sysctl_header;

static struct ctl_table icmp_sysctl_table[] = {

	{

		.ctl_name	= NET_NF_CONNTRACK_ICMP_TIMEOUT,

		.procname	= "nf_conntrack_icmp_timeout",

		.data		= &nf_ct_icmp_timeout,

		.maxlen		= sizeof(unsigned int),
@@ -295,7 +294,6 @@ static struct ctl_table icmp_sysctl_table[] = { 
#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT

static struct ctl_table icmp_compat_sysctl_table[] = {

	{

		.ctl_name	= NET_IPV4_NF_CONNTRACK_ICMP_TIMEOUT,

		.procname	= "ip_conntrack_icmp_timeout",

		.data		= &nf_ct_icmp_timeout,

		.maxlen		= sizeof(unsigned int),

net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c

+0 −1
Original line number Diff line number Diff line
@@ -306,7 +306,6 @@ static struct nf_hook_ops ipv6_conntrack_ops[] = { 
#ifdef CONFIG_SYSCTL

static ctl_table nf_ct_ipv6_sysctl_table[] = {

	{

		.ctl_name	= NET_NF_CONNTRACK_FRAG6_TIMEOUT,

		.procname	= "nf_conntrack_frag6_timeout",

		.data		= &nf_frags_ctl.timeout,

		.maxlen		= sizeof(unsigned int),

net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c

+0 −1
Original line number Diff line number Diff line
@@ -260,7 +260,6 @@ static int icmpv6_nlattr_to_tuple(struct nlattr *tb[], 
static struct ctl_table_header *icmpv6_sysctl_header;

static struct ctl_table icmpv6_sysctl_table[] = {

	{

		.ctl_name	= NET_NF_CONNTRACK_ICMPV6_TIMEOUT,

		.procname	= "nf_conntrack_icmpv6_timeout",

		.data		= &nf_ct_icmpv6_timeout,

		.maxlen		= sizeof(unsigned int),

net/netfilter/nf_conntrack_proto_generic.c

+0 −2
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ static int new(struct nf_conn *conntrack, const struct sk_buff *skb, 
static struct ctl_table_header *generic_sysctl_header;

static struct ctl_table generic_sysctl_table[] = {

	{

		.ctl_name	= NET_NF_CONNTRACK_GENERIC_TIMEOUT,

		.procname	= "nf_conntrack_generic_timeout",

		.data		= &nf_ct_generic_timeout,

		.maxlen		= sizeof(unsigned int),
@@ -84,7 +83,6 @@ static struct ctl_table generic_sysctl_table[] = { 
#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT

static struct ctl_table generic_compat_sysctl_table[] = {

	{

		.ctl_name	= NET_IPV4_NF_CONNTRACK_GENERIC_TIMEOUT,

		.procname	= "ip_conntrack_generic_timeout",

		.data		= &nf_ct_generic_timeout,

		.maxlen		= sizeof(unsigned int),

net/netfilter/nf_conntrack_proto_sctp.c

+0 −14
Original line number Diff line number Diff line
@@ -476,7 +476,6 @@ static unsigned int sctp_sysctl_table_users; 
static struct ctl_table_header *sctp_sysctl_header;

static struct ctl_table sctp_sysctl_table[] = {

	{

		.ctl_name	= NET_NF_CONNTRACK_SCTP_TIMEOUT_CLOSED,

		.procname	= "nf_conntrack_sctp_timeout_closed",

		.data		= &nf_ct_sctp_timeout_closed,

		.maxlen		= sizeof(unsigned int),
@@ -484,7 +483,6 @@ static struct ctl_table sctp_sysctl_table[] = { 
		.proc_handler	= &proc_dointvec_jiffies,

	},

	{

		.ctl_name	= NET_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_WAIT,

		.procname	= "nf_conntrack_sctp_timeout_cookie_wait",

		.data		= &nf_ct_sctp_timeout_cookie_wait,

		.maxlen		= sizeof(unsigned int),
@@ -492,7 +490,6 @@ static struct ctl_table sctp_sysctl_table[] = { 
		.proc_handler	= &proc_dointvec_jiffies,

	},

	{

		.ctl_name	= NET_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_ECHOED,

		.procname	= "nf_conntrack_sctp_timeout_cookie_echoed",

		.data		= &nf_ct_sctp_timeout_cookie_echoed,

		.maxlen		= sizeof(unsigned int),
@@ -500,7 +497,6 @@ static struct ctl_table sctp_sysctl_table[] = { 
		.proc_handler	= &proc_dointvec_jiffies,

	},

	{

		.ctl_name	= NET_NF_CONNTRACK_SCTP_TIMEOUT_ESTABLISHED,

		.procname	= "nf_conntrack_sctp_timeout_established",

		.data		= &nf_ct_sctp_timeout_established,

		.maxlen		= sizeof(unsigned int),
@@ -508,7 +504,6 @@ static struct ctl_table sctp_sysctl_table[] = { 
		.proc_handler	= &proc_dointvec_jiffies,

	},

	{

		.ctl_name	= NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_SENT,

		.procname	= "nf_conntrack_sctp_timeout_shutdown_sent",

		.data		= &nf_ct_sctp_timeout_shutdown_sent,

		.maxlen		= sizeof(unsigned int),
@@ -516,7 +511,6 @@ static struct ctl_table sctp_sysctl_table[] = { 
		.proc_handler	= &proc_dointvec_jiffies,

	},

	{

		.ctl_name	= NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_RECD,

		.procname	= "nf_conntrack_sctp_timeout_shutdown_recd",

		.data		= &nf_ct_sctp_timeout_shutdown_recd,

		.maxlen		= sizeof(unsigned int),
@@ -524,7 +518,6 @@ static struct ctl_table sctp_sysctl_table[] = { 
		.proc_handler	= &proc_dointvec_jiffies,

	},

	{

		.ctl_name	= NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_ACK_SENT,

		.procname	= "nf_conntrack_sctp_timeout_shutdown_ack_sent",

		.data		= &nf_ct_sctp_timeout_shutdown_ack_sent,

		.maxlen		= sizeof(unsigned int),
@@ -539,7 +532,6 @@ static struct ctl_table sctp_sysctl_table[] = { 
#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT

static struct ctl_table sctp_compat_sysctl_table[] = {

	{

		.ctl_name	= NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_CLOSED,

		.procname	= "ip_conntrack_sctp_timeout_closed",

		.data		= &nf_ct_sctp_timeout_closed,

		.maxlen		= sizeof(unsigned int),
@@ -547,7 +539,6 @@ static struct ctl_table sctp_compat_sysctl_table[] = { 
		.proc_handler	= &proc_dointvec_jiffies,

	},

	{

		.ctl_name	= NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_WAIT,

		.procname	= "ip_conntrack_sctp_timeout_cookie_wait",

		.data		= &nf_ct_sctp_timeout_cookie_wait,

		.maxlen		= sizeof(unsigned int),
@@ -555,7 +546,6 @@ static struct ctl_table sctp_compat_sysctl_table[] = { 
		.proc_handler	= &proc_dointvec_jiffies,

	},

	{

		.ctl_name	= NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_ECHOED,

		.procname	= "ip_conntrack_sctp_timeout_cookie_echoed",

		.data		= &nf_ct_sctp_timeout_cookie_echoed,

		.maxlen		= sizeof(unsigned int),
@@ -563,7 +553,6 @@ static struct ctl_table sctp_compat_sysctl_table[] = { 
		.proc_handler	= &proc_dointvec_jiffies,

	},

	{

		.ctl_name	= NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_ESTABLISHED,

		.procname	= "ip_conntrack_sctp_timeout_established",

		.data		= &nf_ct_sctp_timeout_established,

		.maxlen		= sizeof(unsigned int),
@@ -571,7 +560,6 @@ static struct ctl_table sctp_compat_sysctl_table[] = { 
		.proc_handler	= &proc_dointvec_jiffies,

	},

	{

		.ctl_name	= NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_SENT,

		.procname	= "ip_conntrack_sctp_timeout_shutdown_sent",

		.data		= &nf_ct_sctp_timeout_shutdown_sent,

		.maxlen		= sizeof(unsigned int),
@@ -579,7 +567,6 @@ static struct ctl_table sctp_compat_sysctl_table[] = { 
		.proc_handler	= &proc_dointvec_jiffies,

	},

	{

		.ctl_name	= NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_RECD,

		.procname	= "ip_conntrack_sctp_timeout_shutdown_recd",

		.data		= &nf_ct_sctp_timeout_shutdown_recd,

		.maxlen		= sizeof(unsigned int),
@@ -587,7 +574,6 @@ static struct ctl_table sctp_compat_sysctl_table[] = { 
		.proc_handler	= &proc_dointvec_jiffies,

	},

	{

		.ctl_name	= NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_ACK_SENT,

		.procname	= "ip_conntrack_sctp_timeout_shutdown_ack_sent",

		.data		= &nf_ct_sctp_timeout_shutdown_ack_sent,

		.maxlen		= sizeof(unsigned int),