Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Sasha Levin <Alexander.Levin@microsoft.com>
To:     "stable@vger.kernel.org" <stable@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
CC:     Pablo Neira Ayuso <pablo@netfilter.org>,
        Sasha Levin <Alexander.Levin@microsoft.com>
Subject: [PATCH AUTOSEL 4.18 49/65] netfilter: conntrack: timeout interface
 depend on CONFIG_NF_CONNTRACK_TIMEOUT
Thread-Topic: [PATCH AUTOSEL 4.18 49/65] netfilter: conntrack: timeout
 interface depend on CONFIG_NF_CONNTRACK_TIMEOUT
Thread-Index: AQHUWR8UKzoo1cwd7UGQ0n1a8kdf5Q==
Date:   Mon, 1 Oct 2018 00:38:32 +0000
Message-ID: <20181001003754.146961-49-alexander.levin@microsoft.com>
References: <20181001003754.146961-1-alexander.levin@microsoft.com>
In-Reply-To: <20181001003754.146961-1-alexander.levin@microsoft.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: microsoft.com does not designate
 permitted sender hosts)
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 00517848-9467-4523-57f1-08d62736488f
X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Oct 2018 00:38:32.8224
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR21MB0824
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Pablo Neira Ayuso <pablo@netfilter.org>

[ Upstream commit a874752a10da113f513980e28f562d946d3f829d ]

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 000=
0000000000000
[...]
[   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: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
 net/ipv4/netfilter/nf_conntrack_proto_icmp.c  |  8 ++++----
 .../netfilter/nf_conntrack_proto_icmpv6.c     |  8 ++++----
 net/netfilter/nf_conntrack_proto_dccp.c       | 12 +++++------
 net/netfilter/nf_conntrack_proto_generic.c    |  8 ++++----
 net/netfilter/nf_conntrack_proto_gre.c        |  8 ++++----
 net/netfilter/nf_conntrack_proto_sctp.c       | 14 ++++++-------
 net/netfilter/nf_conntrack_proto_tcp.c        | 12 +++++------
 net/netfilter/nf_conntrack_proto_udp.c        | 20 +++++++++----------
 8 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c b/net/ipv4/netfil=
ter/nf_conntrack_proto_icmp.c
index 5c15beafa711..fe70f6290aa4 100644
--- a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
+++ b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
@@ -269,7 +269,7 @@ static unsigned int icmp_nlattr_tuple_size(void)
 }
 #endif
=20
-#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
=20
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netfilter/nfnetlink_cttimeout.h>
@@ -307,7 +307,7 @@ static const struct nla_policy
 icmp_timeout_nla_policy[CTA_TIMEOUT_ICMP_MAX+1] =3D {
 	[CTA_TIMEOUT_ICMP_TIMEOUT]	=3D { .type =3D NLA_U32 },
 };
-#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */
=20
 #ifdef CONFIG_SYSCTL
 static struct ctl_table icmp_sysctl_table[] =3D {
@@ -369,7 +369,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_=
icmp =3D
 	.nlattr_to_tuple	=3D icmp_nlattr_to_tuple,
 	.nla_policy		=3D icmp_nla_policy,
 #endif
-#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
 	.ctnl_timeout		=3D {
 		.nlattr_to_obj	=3D icmp_timeout_nlattr_to_obj,
 		.obj_to_nlattr	=3D icmp_timeout_obj_to_nlattr,
@@ -377,7 +377,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_=
icmp =3D
 		.obj_size	=3D sizeof(unsigned int),
 		.nla_policy	=3D icmp_timeout_nla_policy,
 	},
-#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */
 	.init_net		=3D icmp_init_net,
 	.get_net_proto		=3D icmp_get_net_proto,
 };
diff --git a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c b/net/ipv6/netf=
ilter/nf_conntrack_proto_icmpv6.c
index 2548e2c8aedd..992019082b1f 100644
--- a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
+++ b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
@@ -270,7 +270,7 @@ static unsigned int icmpv6_nlattr_tuple_size(void)
 }
 #endif
=20
-#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
=20
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netfilter/nfnetlink_cttimeout.h>
@@ -308,7 +308,7 @@ static const struct nla_policy
 icmpv6_timeout_nla_policy[CTA_TIMEOUT_ICMPV6_MAX+1] =3D {
 	[CTA_TIMEOUT_ICMPV6_TIMEOUT]	=3D { .type =3D NLA_U32 },
 };
-#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */
=20
 #ifdef CONFIG_SYSCTL
 static struct ctl_table icmpv6_sysctl_table[] =3D {
@@ -368,7 +368,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_=
icmpv6 =3D
 	.nlattr_to_tuple	=3D icmpv6_nlattr_to_tuple,
 	.nla_policy		=3D icmpv6_nla_policy,
 #endif
-#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
 	.ctnl_timeout		=3D {
 		.nlattr_to_obj	=3D icmpv6_timeout_nlattr_to_obj,
 		.obj_to_nlattr	=3D icmpv6_timeout_obj_to_nlattr,
@@ -376,7 +376,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_=
icmpv6 =3D
 		.obj_size	=3D sizeof(unsigned int),
 		.nla_policy	=3D icmpv6_timeout_nla_policy,
 	},
-#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */
 	.init_net		=3D icmpv6_init_net,
 	.get_net_proto		=3D icmpv6_get_net_proto,
 };
diff --git a/net/netfilter/nf_conntrack_proto_dccp.c b/net/netfilter/nf_con=
ntrack_proto_dccp.c
index 9ce6336d1e55..02ed43f93656 100644
--- a/net/netfilter/nf_conntrack_proto_dccp.c
+++ b/net/netfilter/nf_conntrack_proto_dccp.c
@@ -699,7 +699,7 @@ static int nlattr_to_dccp(struct nlattr *cda[], struct =
nf_conn *ct)
 }
 #endif
=20
-#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
=20
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netfilter/nfnetlink_cttimeout.h>
@@ -750,7 +750,7 @@ dccp_timeout_nla_policy[CTA_TIMEOUT_DCCP_MAX+1] =3D {
 	[CTA_TIMEOUT_DCCP_CLOSING]	=3D { .type =3D NLA_U32 },
 	[CTA_TIMEOUT_DCCP_TIMEWAIT]	=3D { .type =3D NLA_U32 },
 };
-#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */
=20
 #ifdef CONFIG_SYSCTL
 /* template, data assigned later */
@@ -883,7 +883,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_=
dccp4 =3D {
 	.nlattr_to_tuple	=3D nf_ct_port_nlattr_to_tuple,
 	.nla_policy		=3D nf_ct_port_nla_policy,
 #endif
-#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
 	.ctnl_timeout		=3D {
 		.nlattr_to_obj	=3D dccp_timeout_nlattr_to_obj,
 		.obj_to_nlattr	=3D dccp_timeout_obj_to_nlattr,
@@ -891,7 +891,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_=
dccp4 =3D {
 		.obj_size	=3D sizeof(unsigned int) * CT_DCCP_MAX,
 		.nla_policy	=3D dccp_timeout_nla_policy,
 	},
-#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */
 	.init_net		=3D dccp_init_net,
 	.get_net_proto		=3D dccp_get_net_proto,
 };
@@ -919,7 +919,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_=
dccp6 =3D {
 	.nlattr_to_tuple	=3D nf_ct_port_nlattr_to_tuple,
 	.nla_policy		=3D nf_ct_port_nla_policy,
 #endif
-#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
 	.ctnl_timeout		=3D {
 		.nlattr_to_obj	=3D dccp_timeout_nlattr_to_obj,
 		.obj_to_nlattr	=3D dccp_timeout_obj_to_nlattr,
@@ -927,7 +927,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_=
dccp6 =3D {
 		.obj_size	=3D sizeof(unsigned int) * CT_DCCP_MAX,
 		.nla_policy	=3D dccp_timeout_nla_policy,
 	},
-#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */
 	.init_net		=3D dccp_init_net,
 	.get_net_proto		=3D dccp_get_net_proto,
 };
diff --git a/net/netfilter/nf_conntrack_proto_generic.c b/net/netfilter/nf_=
conntrack_proto_generic.c
index 6c6896d21cd7..bc5e95b9a2e5 100644
--- a/net/netfilter/nf_conntrack_proto_generic.c
+++ b/net/netfilter/nf_conntrack_proto_generic.c
@@ -79,7 +79,7 @@ static bool generic_new(struct nf_conn *ct, const struct =
sk_buff *skb,
 	return ret;
 }
=20
-#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
=20
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netfilter/nfnetlink_cttimeout.h>
@@ -119,7 +119,7 @@ static const struct nla_policy
 generic_timeout_nla_policy[CTA_TIMEOUT_GENERIC_MAX+1] =3D {
 	[CTA_TIMEOUT_GENERIC_TIMEOUT]	=3D { .type =3D NLA_U32 },
 };
-#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */
=20
 #ifdef CONFIG_SYSCTL
 static struct ctl_table generic_sysctl_table[] =3D {
@@ -172,7 +172,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_=
generic =3D
 	.packet			=3D generic_packet,
 	.get_timeouts		=3D generic_get_timeouts,
 	.new			=3D generic_new,
-#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
 	.ctnl_timeout		=3D {
 		.nlattr_to_obj	=3D generic_timeout_nlattr_to_obj,
 		.obj_to_nlattr	=3D generic_timeout_obj_to_nlattr,
@@ -180,7 +180,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_=
generic =3D
 		.obj_size	=3D sizeof(unsigned int),
 		.nla_policy	=3D generic_timeout_nla_policy,
 	},
-#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */
 	.init_net		=3D generic_init_net,
 	.get_net_proto		=3D generic_get_net_proto,
 };
diff --git a/net/netfilter/nf_conntrack_proto_gre.c b/net/netfilter/nf_conn=
track_proto_gre.c
index d049ea5a3770..d3ffdb5e96fe 100644
--- a/net/netfilter/nf_conntrack_proto_gre.c
+++ b/net/netfilter/nf_conntrack_proto_gre.c
@@ -289,7 +289,7 @@ static void gre_destroy(struct nf_conn *ct)
 		nf_ct_gre_keymap_destroy(master);
 }
=20
-#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
=20
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netfilter/nfnetlink_cttimeout.h>
@@ -336,7 +336,7 @@ gre_timeout_nla_policy[CTA_TIMEOUT_GRE_MAX+1] =3D {
 	[CTA_TIMEOUT_GRE_UNREPLIED]	=3D { .type =3D NLA_U32 },
 	[CTA_TIMEOUT_GRE_REPLIED]	=3D { .type =3D NLA_U32 },
 };
-#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */
=20
 static int gre_init_net(struct net *net, u_int16_t proto)
 {
@@ -371,7 +371,7 @@ static const struct nf_conntrack_l4proto nf_conntrack_l=
4proto_gre4 =3D {
 	.nlattr_to_tuple =3D nf_ct_port_nlattr_to_tuple,
 	.nla_policy	 =3D nf_ct_port_nla_policy,
 #endif
-#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
 	.ctnl_timeout    =3D {
 		.nlattr_to_obj	=3D gre_timeout_nlattr_to_obj,
 		.obj_to_nlattr	=3D gre_timeout_obj_to_nlattr,
@@ -379,7 +379,7 @@ static const struct nf_conntrack_l4proto nf_conntrack_l=
4proto_gre4 =3D {
 		.obj_size	=3D sizeof(unsigned int) * GRE_CT_MAX,
 		.nla_policy	=3D gre_timeout_nla_policy,
 	},
-#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */
 	.net_id		=3D &proto_gre_net_id,
 	.init_net	=3D gre_init_net,
 };
diff --git a/net/netfilter/nf_conntrack_proto_sctp.c b/net/netfilter/nf_con=
ntrack_proto_sctp.c
index fb9a35d16069..3b825b51e206 100644
--- a/net/netfilter/nf_conntrack_proto_sctp.c
+++ b/net/netfilter/nf_conntrack_proto_sctp.c
@@ -615,7 +615,7 @@ static int nlattr_to_sctp(struct nlattr *cda[], struct =
nf_conn *ct)
 }
 #endif
=20
-#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
=20
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netfilter/nfnetlink_cttimeout.h>
@@ -668,7 +668,7 @@ sctp_timeout_nla_policy[CTA_TIMEOUT_SCTP_MAX+1] =3D {
 	[CTA_TIMEOUT_SCTP_HEARTBEAT_SENT]	=3D { .type =3D NLA_U32 },
 	[CTA_TIMEOUT_SCTP_HEARTBEAT_ACKED]	=3D { .type =3D NLA_U32 },
 };
-#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */
=20
=20
 #ifdef CONFIG_SYSCTL
@@ -800,7 +800,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_=
sctp4 =3D {
 	.nlattr_to_tuple	=3D nf_ct_port_nlattr_to_tuple,
 	.nla_policy		=3D nf_ct_port_nla_policy,
 #endif
-#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
 	.ctnl_timeout		=3D {
 		.nlattr_to_obj	=3D sctp_timeout_nlattr_to_obj,
 		.obj_to_nlattr	=3D sctp_timeout_obj_to_nlattr,
@@ -808,7 +808,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_=
sctp4 =3D {
 		.obj_size	=3D sizeof(unsigned int) * SCTP_CONNTRACK_MAX,
 		.nla_policy	=3D sctp_timeout_nla_policy,
 	},
-#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */
 	.init_net		=3D sctp_init_net,
 	.get_net_proto		=3D sctp_get_net_proto,
 };
@@ -836,7 +836,8 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_=
sctp6 =3D {
 	.nlattr_tuple_size	=3D nf_ct_port_nlattr_tuple_size,
 	.nlattr_to_tuple	=3D nf_ct_port_nlattr_to_tuple,
 	.nla_policy		=3D nf_ct_port_nla_policy,
-#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
+#endif
+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
 	.ctnl_timeout		=3D {
 		.nlattr_to_obj	=3D sctp_timeout_nlattr_to_obj,
 		.obj_to_nlattr	=3D sctp_timeout_obj_to_nlattr,
@@ -844,8 +845,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_=
sctp6 =3D {
 		.obj_size	=3D sizeof(unsigned int) * SCTP_CONNTRACK_MAX,
 		.nla_policy	=3D sctp_timeout_nla_policy,
 	},
-#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
-#endif
+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */
 	.init_net		=3D sctp_init_net,
 	.get_net_proto		=3D sctp_get_net_proto,
 };
diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conn=
track_proto_tcp.c
index 8e67910185a0..8b3594f13be2 100644
--- a/net/netfilter/nf_conntrack_proto_tcp.c
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
@@ -1305,7 +1305,7 @@ static unsigned int tcp_nlattr_tuple_size(void)
 }
 #endif
=20
-#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
=20
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netfilter/nfnetlink_cttimeout.h>
@@ -1415,7 +1415,7 @@ static const struct nla_policy tcp_timeout_nla_policy=
[CTA_TIMEOUT_TCP_MAX+1] =3D {
 	[CTA_TIMEOUT_TCP_RETRANS]	=3D { .type =3D NLA_U32 },
 	[CTA_TIMEOUT_TCP_UNACK]		=3D { .type =3D NLA_U32 },
 };
-#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */
=20
 #ifdef CONFIG_SYSCTL
 static struct ctl_table tcp_sysctl_table[] =3D {
@@ -1578,7 +1578,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4prot=
o_tcp4 =3D
 	.nlattr_size		=3D TCP_NLATTR_SIZE,
 	.nla_policy		=3D nf_ct_port_nla_policy,
 #endif
-#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
 	.ctnl_timeout		=3D {
 		.nlattr_to_obj	=3D tcp_timeout_nlattr_to_obj,
 		.obj_to_nlattr	=3D tcp_timeout_obj_to_nlattr,
@@ -1587,7 +1587,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4prot=
o_tcp4 =3D
 					TCP_CONNTRACK_TIMEOUT_MAX,
 		.nla_policy	=3D tcp_timeout_nla_policy,
 	},
-#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */
 	.init_net		=3D tcp_init_net,
 	.get_net_proto		=3D tcp_get_net_proto,
 };
@@ -1616,7 +1616,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4prot=
o_tcp6 =3D
 	.nlattr_tuple_size	=3D tcp_nlattr_tuple_size,
 	.nla_policy		=3D nf_ct_port_nla_policy,
 #endif
-#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
 	.ctnl_timeout		=3D {
 		.nlattr_to_obj	=3D tcp_timeout_nlattr_to_obj,
 		.obj_to_nlattr	=3D tcp_timeout_obj_to_nlattr,
@@ -1625,7 +1625,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4prot=
o_tcp6 =3D
 					TCP_CONNTRACK_TIMEOUT_MAX,
 		.nla_policy	=3D tcp_timeout_nla_policy,
 	},
-#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */
 	.init_net		=3D tcp_init_net,
 	.get_net_proto		=3D tcp_get_net_proto,
 };
diff --git a/net/netfilter/nf_conntrack_proto_udp.c b/net/netfilter/nf_conn=
track_proto_udp.c
index fe7243970aa4..1ac65859166a 100644
--- a/net/netfilter/nf_conntrack_proto_udp.c
+++ b/net/netfilter/nf_conntrack_proto_udp.c
@@ -192,7 +192,7 @@ static int udp_error(struct net *net, struct nf_conn *t=
mpl, struct sk_buff *skb,
 	return NF_ACCEPT;
 }
=20
-#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
=20
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netfilter/nfnetlink_cttimeout.h>
@@ -239,7 +239,7 @@ udp_timeout_nla_policy[CTA_TIMEOUT_UDP_MAX+1] =3D {
        [CTA_TIMEOUT_UDP_UNREPLIED]	=3D { .type =3D NLA_U32 },
        [CTA_TIMEOUT_UDP_REPLIED]	=3D { .type =3D NLA_U32 },
 };
-#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */
=20
 #ifdef CONFIG_SYSCTL
 static struct ctl_table udp_sysctl_table[] =3D {
@@ -313,7 +313,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_=
udp4 =3D
 	.nlattr_tuple_size	=3D nf_ct_port_nlattr_tuple_size,
 	.nla_policy		=3D nf_ct_port_nla_policy,
 #endif
-#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
 	.ctnl_timeout		=3D {
 		.nlattr_to_obj	=3D udp_timeout_nlattr_to_obj,
 		.obj_to_nlattr	=3D udp_timeout_obj_to_nlattr,
@@ -321,7 +321,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_=
udp4 =3D
 		.obj_size	=3D sizeof(unsigned int) * CTA_TIMEOUT_UDP_MAX,
 		.nla_policy	=3D udp_timeout_nla_policy,
 	},
-#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */
 	.init_net		=3D udp_init_net,
 	.get_net_proto		=3D udp_get_net_proto,
 };
@@ -345,7 +345,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_=
udplite4 =3D
 	.nlattr_tuple_size	=3D nf_ct_port_nlattr_tuple_size,
 	.nla_policy		=3D nf_ct_port_nla_policy,
 #endif
-#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
 	.ctnl_timeout		=3D {
 		.nlattr_to_obj	=3D udp_timeout_nlattr_to_obj,
 		.obj_to_nlattr	=3D udp_timeout_obj_to_nlattr,
@@ -353,7 +353,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_=
udplite4 =3D
 		.obj_size	=3D sizeof(unsigned int) * CTA_TIMEOUT_UDP_MAX,
 		.nla_policy	=3D udp_timeout_nla_policy,
 	},
-#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */
 	.init_net		=3D udp_init_net,
 	.get_net_proto		=3D udp_get_net_proto,
 };
@@ -377,7 +377,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_=
udp6 =3D
 	.nlattr_tuple_size	=3D nf_ct_port_nlattr_tuple_size,
 	.nla_policy		=3D nf_ct_port_nla_policy,
 #endif
-#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
 	.ctnl_timeout		=3D {
 		.nlattr_to_obj	=3D udp_timeout_nlattr_to_obj,
 		.obj_to_nlattr	=3D udp_timeout_obj_to_nlattr,
@@ -385,7 +385,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_=
udp6 =3D
 		.obj_size	=3D sizeof(unsigned int) * CTA_TIMEOUT_UDP_MAX,
 		.nla_policy	=3D udp_timeout_nla_policy,
 	},
-#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */
 	.init_net		=3D udp_init_net,
 	.get_net_proto		=3D udp_get_net_proto,
 };
@@ -409,7 +409,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_=
udplite6 =3D
 	.nlattr_tuple_size	=3D nf_ct_port_nlattr_tuple_size,
 	.nla_policy		=3D nf_ct_port_nla_policy,
 #endif
-#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
 	.ctnl_timeout		=3D {
 		.nlattr_to_obj	=3D udp_timeout_nlattr_to_obj,
 		.obj_to_nlattr	=3D udp_timeout_obj_to_nlattr,
@@ -417,7 +417,7 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_=
udplite6 =3D
 		.obj_size	=3D sizeof(unsigned int) * CTA_TIMEOUT_UDP_MAX,
 		.nla_policy	=3D udp_timeout_nla_policy,
 	},
-#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */
 	.init_net		=3D udp_init_net,
 	.get_net_proto		=3D udp_get_net_proto,
 };
--=20
2.17.1