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

Commit a874752a authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: conntrack: timeout interface depend on CONFIG_NF_CONNTRACK_TIMEOUT 



Now that cttimeout support for nft_ct is in place, these should depend
on CONFIG_NF_CONNTRACK_TIMEOUT otherwise we can crash when dumping the
policy if this option is not enabled.

[   71.600121] BUG: unable to handle kernel NULL pointer dereference at 0000000000000000
[...]
[   71.600141] CPU: 3 PID: 7612 Comm: nft Not tainted 4.18.0+ #246
[...]
[   71.600188] Call Trace:
[   71.600201]  ? nft_ct_timeout_obj_dump+0xc6/0xf0 [nft_ct]

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent f94e6380

net/netfilter/nf_conntrack_proto_dccp.c

+6 −6
Original line number Diff line number Diff line
@@ -675,7 +675,7 @@ static int nlattr_to_dccp(struct nlattr *cda[], struct nf_conn *ct) 
}

#endif



#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)

#ifdef CONFIG_NF_CONNTRACK_TIMEOUT



#include <linux/netfilter/nfnetlink.h>

#include <linux/netfilter/nfnetlink_cttimeout.h>
@@ -728,7 +728,7 @@ dccp_timeout_nla_policy[CTA_TIMEOUT_DCCP_MAX+1] = { 
	[CTA_TIMEOUT_DCCP_CLOSING]	= { .type = NLA_U32 },

	[CTA_TIMEOUT_DCCP_TIMEWAIT]	= { .type = NLA_U32 },

};

#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */

#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */



#ifdef CONFIG_SYSCTL

/* template, data assigned later */
@@ -863,7 +863,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_dccp4 = { 
	.nlattr_to_tuple	= nf_ct_port_nlattr_to_tuple,

	.nla_policy		= nf_ct_port_nla_policy,

#endif

#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)

#ifdef CONFIG_NF_CONNTRACK_TIMEOUT

	.ctnl_timeout		= {

		.nlattr_to_obj	= dccp_timeout_nlattr_to_obj,

		.obj_to_nlattr	= dccp_timeout_obj_to_nlattr,
@@ -871,7 +871,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_dccp4 = { 
		.obj_size	= sizeof(unsigned int) * CT_DCCP_MAX,

		.nla_policy	= dccp_timeout_nla_policy,

	},

#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */

#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */

	.init_net		= dccp_init_net,

	.get_net_proto		= dccp_get_net_proto,

};
@@ -896,7 +896,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_dccp6 = { 
	.nlattr_to_tuple	= nf_ct_port_nlattr_to_tuple,

	.nla_policy		= nf_ct_port_nla_policy,

#endif

#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)

#ifdef CONFIG_NF_CONNTRACK_TIMEOUT

	.ctnl_timeout		= {

		.nlattr_to_obj	= dccp_timeout_nlattr_to_obj,

		.obj_to_nlattr	= dccp_timeout_obj_to_nlattr,
@@ -904,7 +904,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_dccp6 = { 
		.obj_size	= sizeof(unsigned int) * CT_DCCP_MAX,

		.nla_policy	= dccp_timeout_nla_policy,

	},

#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */

#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */

	.init_net		= dccp_init_net,

	.get_net_proto		= dccp_get_net_proto,

};

net/netfilter/nf_conntrack_proto_generic.c

+4 −4
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static bool generic_new(struct nf_conn *ct, const struct sk_buff *skb, 
	return ret;

}



#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)

#ifdef CONFIG_NF_CONNTRACK_TIMEOUT



#include <linux/netfilter/nfnetlink.h>

#include <linux/netfilter/nfnetlink_cttimeout.h>
@@ -113,7 +113,7 @@ static const struct nla_policy 
generic_timeout_nla_policy[CTA_TIMEOUT_GENERIC_MAX+1] = {

	[CTA_TIMEOUT_GENERIC_TIMEOUT]	= { .type = NLA_U32 },

};

#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */

#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */



#ifdef CONFIG_SYSCTL

static struct ctl_table generic_sysctl_table[] = {
@@ -164,7 +164,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_generic = 
	.pkt_to_tuple		= generic_pkt_to_tuple,

	.packet			= generic_packet,

	.new			= generic_new,

#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)

#ifdef CONFIG_NF_CONNTRACK_TIMEOUT

	.ctnl_timeout		= {

		.nlattr_to_obj	= generic_timeout_nlattr_to_obj,

		.obj_to_nlattr	= generic_timeout_obj_to_nlattr,
@@ -172,7 +172,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_generic = 
		.obj_size	= sizeof(unsigned int),

		.nla_policy	= generic_timeout_nla_policy,

	},

#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */

#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */

	.init_net		= generic_init_net,

	.get_net_proto		= generic_get_net_proto,

};

net/netfilter/nf_conntrack_proto_gre.c

+4 −4
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ static void gre_destroy(struct nf_conn *ct) 
		nf_ct_gre_keymap_destroy(master);

}



#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)

#ifdef CONFIG_NF_CONNTRACK_TIMEOUT



#include <linux/netfilter/nfnetlink.h>

#include <linux/netfilter/nfnetlink_cttimeout.h>
@@ -334,7 +334,7 @@ gre_timeout_nla_policy[CTA_TIMEOUT_GRE_MAX+1] = { 
	[CTA_TIMEOUT_GRE_UNREPLIED]	= { .type = NLA_U32 },

	[CTA_TIMEOUT_GRE_REPLIED]	= { .type = NLA_U32 },

};

#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */

#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */



static int gre_init_net(struct net *net, u_int16_t proto)

{
@@ -367,7 +367,7 @@ static const struct nf_conntrack_l4proto nf_conntrack_l4proto_gre4 = { 
	.nlattr_to_tuple = nf_ct_port_nlattr_to_tuple,

	.nla_policy	 = nf_ct_port_nla_policy,

#endif

#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)

#ifdef CONFIG_NF_CONNTRACK_TIMEOUT

	.ctnl_timeout    = {

		.nlattr_to_obj	= gre_timeout_nlattr_to_obj,

		.obj_to_nlattr	= gre_timeout_obj_to_nlattr,
@@ -375,7 +375,7 @@ static const struct nf_conntrack_l4proto nf_conntrack_l4proto_gre4 = { 
		.obj_size	= sizeof(unsigned int) * GRE_CT_MAX,

		.nla_policy	= gre_timeout_nla_policy,

	},

#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */

#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */

	.net_id		= &proto_gre_net_id,

	.init_net	= gre_init_net,

};

net/netfilter/nf_conntrack_proto_icmp.c

+4 −4
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ static unsigned int icmp_nlattr_tuple_size(void) 
}

#endif



#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)

#ifdef CONFIG_NF_CONNTRACK_TIMEOUT



#include <linux/netfilter/nfnetlink.h>

#include <linux/netfilter/nfnetlink_cttimeout.h>
@@ -313,7 +313,7 @@ static const struct nla_policy 
icmp_timeout_nla_policy[CTA_TIMEOUT_ICMP_MAX+1] = {

	[CTA_TIMEOUT_ICMP_TIMEOUT]	= { .type = NLA_U32 },

};

#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */

#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */



#ifdef CONFIG_SYSCTL

static struct ctl_table icmp_sysctl_table[] = {
@@ -374,7 +374,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp = 
	.nlattr_to_tuple	= icmp_nlattr_to_tuple,

	.nla_policy		= icmp_nla_policy,

#endif

#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)

#ifdef CONFIG_NF_CONNTRACK_TIMEOUT

	.ctnl_timeout		= {

		.nlattr_to_obj	= icmp_timeout_nlattr_to_obj,

		.obj_to_nlattr	= icmp_timeout_obj_to_nlattr,
@@ -382,7 +382,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp = 
		.obj_size	= sizeof(unsigned int),

		.nla_policy	= icmp_timeout_nla_policy,

	},

#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */

#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */

	.init_net		= icmp_init_net,

	.get_net_proto		= icmp_get_net_proto,

};

net/netfilter/nf_conntrack_proto_icmpv6.c

+4 −4
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ static unsigned int icmpv6_nlattr_tuple_size(void) 
}

#endif



#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)

#ifdef CONFIG_NF_CONNTRACK_TIMEOUT



#include <linux/netfilter/nfnetlink.h>

#include <linux/netfilter/nfnetlink_cttimeout.h>
@@ -314,7 +314,7 @@ static const struct nla_policy 
icmpv6_timeout_nla_policy[CTA_TIMEOUT_ICMPV6_MAX+1] = {

	[CTA_TIMEOUT_ICMPV6_TIMEOUT]	= { .type = NLA_U32 },

};

#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */

#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */



#ifdef CONFIG_SYSCTL

static struct ctl_table icmpv6_sysctl_table[] = {
@@ -373,7 +373,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6 = 
	.nlattr_to_tuple	= icmpv6_nlattr_to_tuple,

	.nla_policy		= icmpv6_nla_policy,

#endif

#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)

#ifdef CONFIG_NF_CONNTRACK_TIMEOUT

	.ctnl_timeout		= {

		.nlattr_to_obj	= icmpv6_timeout_nlattr_to_obj,

		.obj_to_nlattr	= icmpv6_timeout_obj_to_nlattr,
@@ -381,7 +381,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6 = 
		.obj_size	= sizeof(unsigned int),

		.nla_policy	= icmpv6_timeout_nla_policy,

	},

#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */

#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */

	.init_net		= icmpv6_init_net,

	.get_net_proto		= icmpv6_get_net_proto,

};