From: Greg Kroah-Hartman Date: Tue, 9 Oct 2018 16:07:59 +0000 (+0200) Subject: drop netfilter patch X-Git-Tag: v4.4.160~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3320538ff71acc585a6122a3b5a2af60766de3c4;p=thirdparty%2Fkernel%2Fstable-queue.git drop netfilter patch --- diff --git a/queue-4.14/netfilter-conntrack-timeout-interface-depend-on-config_nf_conntrack_timeout.patch b/queue-4.14/netfilter-conntrack-timeout-interface-depend-on-config_nf_conntrack_timeout.patch deleted file mode 100644 index 08bd15ab88b..00000000000 --- a/queue-4.14/netfilter-conntrack-timeout-interface-depend-on-config_nf_conntrack_timeout.patch +++ /dev/null @@ -1,448 +0,0 @@ -From foo@baz Mon Oct 8 17:56:31 CEST 2018 -From: Pablo Neira Ayuso -Date: Fri, 31 Aug 2018 12:36:01 +0200 -Subject: netfilter: conntrack: timeout interface depend on CONFIG_NF_CONNTRACK_TIMEOUT - -From: Pablo Neira Ayuso - -[ 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 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: Pablo Neira Ayuso -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 8 ++++---- - net/ipv6/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(-) - ---- a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c -+++ b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c -@@ -265,7 +265,7 @@ static int icmp_nlattr_tuple_size(void) - } - #endif - --#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT) -+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT - - #include - #include -@@ -303,7 +303,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[] = { -@@ -365,7 +365,7 @@ struct nf_conntrack_l4proto nf_conntrack - .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, -@@ -373,7 +373,7 @@ struct nf_conntrack_l4proto nf_conntrack - .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, - }; ---- a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c -+++ b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c -@@ -264,7 +264,7 @@ static int icmpv6_nlattr_tuple_size(void - } - #endif - --#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT) -+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT - - #include - #include -@@ -302,7 +302,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[] = { -@@ -362,7 +362,7 @@ struct nf_conntrack_l4proto nf_conntrack - .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, -@@ -370,7 +370,7 @@ struct nf_conntrack_l4proto nf_conntrack - .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, - }; ---- a/net/netfilter/nf_conntrack_proto_dccp.c -+++ b/net/netfilter/nf_conntrack_proto_dccp.c -@@ -709,7 +709,7 @@ static int dccp_nlattr_size(void) - - #endif - --#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT) -+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT - - #include - #include -@@ -760,7 +760,7 @@ dccp_timeout_nla_policy[CTA_TIMEOUT_DCCP - [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 */ -@@ -893,7 +893,7 @@ struct nf_conntrack_l4proto nf_conntrack - .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, -@@ -901,7 +901,7 @@ struct nf_conntrack_l4proto nf_conntrack - .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, - }; -@@ -929,7 +929,7 @@ struct nf_conntrack_l4proto nf_conntrack - .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, -@@ -937,7 +937,7 @@ struct nf_conntrack_l4proto nf_conntrack - .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, - }; ---- a/net/netfilter/nf_conntrack_proto_generic.c -+++ b/net/netfilter/nf_conntrack_proto_generic.c -@@ -80,7 +80,7 @@ static bool generic_new(struct nf_conn * - return ret; - } - --#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT) -+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT - - #include - #include -@@ -120,7 +120,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[] = { -@@ -173,7 +173,7 @@ struct nf_conntrack_l4proto nf_conntrack - .packet = generic_packet, - .get_timeouts = generic_get_timeouts, - .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, -@@ -181,7 +181,7 @@ struct nf_conntrack_l4proto nf_conntrack - .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, - }; ---- a/net/netfilter/nf_conntrack_proto_gre.c -+++ b/net/netfilter/nf_conntrack_proto_gre.c -@@ -290,7 +290,7 @@ static void gre_destroy(struct nf_conn * - nf_ct_gre_keymap_destroy(master); - } - --#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT) -+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT - - #include - #include -@@ -337,7 +337,7 @@ gre_timeout_nla_policy[CTA_TIMEOUT_GRE_M - [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) - { -@@ -372,7 +372,7 @@ static struct nf_conntrack_l4proto nf_co - .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, -@@ -380,7 +380,7 @@ static struct nf_conntrack_l4proto nf_co - .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, - }; ---- a/net/netfilter/nf_conntrack_proto_sctp.c -+++ b/net/netfilter/nf_conntrack_proto_sctp.c -@@ -618,7 +618,7 @@ static int sctp_nlattr_size(void) - } - #endif - --#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT) -+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT - - #include - #include -@@ -671,7 +671,7 @@ sctp_timeout_nla_policy[CTA_TIMEOUT_SCTP - [CTA_TIMEOUT_SCTP_HEARTBEAT_SENT] = { .type = NLA_U32 }, - [CTA_TIMEOUT_SCTP_HEARTBEAT_ACKED] = { .type = NLA_U32 }, - }; --#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ -+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ - - - #ifdef CONFIG_SYSCTL -@@ -803,7 +803,7 @@ struct nf_conntrack_l4proto nf_conntrack - .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 = sctp_timeout_nlattr_to_obj, - .obj_to_nlattr = sctp_timeout_obj_to_nlattr, -@@ -811,7 +811,7 @@ struct nf_conntrack_l4proto nf_conntrack - .obj_size = sizeof(unsigned int) * SCTP_CONNTRACK_MAX, - .nla_policy = sctp_timeout_nla_policy, - }, --#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ -+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ - .init_net = sctp_init_net, - .get_net_proto = sctp_get_net_proto, - }; -@@ -839,7 +839,8 @@ struct nf_conntrack_l4proto nf_conntrack - .nlattr_tuple_size = nf_ct_port_nlattr_tuple_size, - .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, - .nla_policy = nf_ct_port_nla_policy, --#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT) -+#endif -+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT - .ctnl_timeout = { - .nlattr_to_obj = sctp_timeout_nlattr_to_obj, - .obj_to_nlattr = sctp_timeout_obj_to_nlattr, -@@ -847,8 +848,7 @@ struct nf_conntrack_l4proto nf_conntrack - .obj_size = sizeof(unsigned int) * SCTP_CONNTRACK_MAX, - .nla_policy = sctp_timeout_nla_policy, - }, --#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ --#endif -+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ - .init_net = sctp_init_net, - .get_net_proto = sctp_get_net_proto, - }; ---- a/net/netfilter/nf_conntrack_proto_tcp.c -+++ b/net/netfilter/nf_conntrack_proto_tcp.c -@@ -1294,7 +1294,7 @@ static int tcp_nlattr_tuple_size(void) - } - #endif - --#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT) -+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT - - #include - #include -@@ -1404,7 +1404,7 @@ static const struct nla_policy tcp_timeo - [CTA_TIMEOUT_TCP_RETRANS] = { .type = NLA_U32 }, - [CTA_TIMEOUT_TCP_UNACK] = { .type = NLA_U32 }, - }; --#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ -+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ - - #ifdef CONFIG_SYSCTL - static struct ctl_table tcp_sysctl_table[] = { -@@ -1567,7 +1567,7 @@ struct nf_conntrack_l4proto nf_conntrack - .nlattr_tuple_size = tcp_nlattr_tuple_size, - .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 = tcp_timeout_nlattr_to_obj, - .obj_to_nlattr = tcp_timeout_obj_to_nlattr, -@@ -1576,7 +1576,7 @@ struct nf_conntrack_l4proto nf_conntrack - TCP_CONNTRACK_TIMEOUT_MAX, - .nla_policy = tcp_timeout_nla_policy, - }, --#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ -+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ - .init_net = tcp_init_net, - .get_net_proto = tcp_get_net_proto, - }; -@@ -1605,7 +1605,7 @@ struct nf_conntrack_l4proto nf_conntrack - .nlattr_tuple_size = tcp_nlattr_tuple_size, - .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 = tcp_timeout_nlattr_to_obj, - .obj_to_nlattr = tcp_timeout_obj_to_nlattr, -@@ -1614,7 +1614,7 @@ struct nf_conntrack_l4proto nf_conntrack - TCP_CONNTRACK_TIMEOUT_MAX, - .nla_policy = tcp_timeout_nla_policy, - }, --#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ -+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ - .init_net = tcp_init_net, - .get_net_proto = tcp_get_net_proto, - }; ---- a/net/netfilter/nf_conntrack_proto_udp.c -+++ b/net/netfilter/nf_conntrack_proto_udp.c -@@ -195,7 +195,7 @@ static int udp_error(struct net *net, st - return NF_ACCEPT; - } - --#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT) -+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT - - #include - #include -@@ -242,7 +242,7 @@ udp_timeout_nla_policy[CTA_TIMEOUT_UDP_M - [CTA_TIMEOUT_UDP_UNREPLIED] = { .type = NLA_U32 }, - [CTA_TIMEOUT_UDP_REPLIED] = { .type = NLA_U32 }, - }; --#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ -+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ - - #ifdef CONFIG_SYSCTL - static struct ctl_table udp_sysctl_table[] = { -@@ -316,7 +316,7 @@ struct nf_conntrack_l4proto nf_conntrack - .nlattr_tuple_size = nf_ct_port_nlattr_tuple_size, - .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 = udp_timeout_nlattr_to_obj, - .obj_to_nlattr = udp_timeout_obj_to_nlattr, -@@ -324,7 +324,7 @@ struct nf_conntrack_l4proto nf_conntrack - .obj_size = sizeof(unsigned int) * CTA_TIMEOUT_UDP_MAX, - .nla_policy = udp_timeout_nla_policy, - }, --#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ -+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ - .init_net = udp_init_net, - .get_net_proto = udp_get_net_proto, - }; -@@ -348,7 +348,7 @@ struct nf_conntrack_l4proto nf_conntrack - .nlattr_tuple_size = nf_ct_port_nlattr_tuple_size, - .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 = udp_timeout_nlattr_to_obj, - .obj_to_nlattr = udp_timeout_obj_to_nlattr, -@@ -356,7 +356,7 @@ struct nf_conntrack_l4proto nf_conntrack - .obj_size = sizeof(unsigned int) * CTA_TIMEOUT_UDP_MAX, - .nla_policy = udp_timeout_nla_policy, - }, --#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ -+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ - .init_net = udp_init_net, - .get_net_proto = udp_get_net_proto, - }; -@@ -380,7 +380,7 @@ struct nf_conntrack_l4proto nf_conntrack - .nlattr_tuple_size = nf_ct_port_nlattr_tuple_size, - .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 = udp_timeout_nlattr_to_obj, - .obj_to_nlattr = udp_timeout_obj_to_nlattr, -@@ -388,7 +388,7 @@ struct nf_conntrack_l4proto nf_conntrack - .obj_size = sizeof(unsigned int) * CTA_TIMEOUT_UDP_MAX, - .nla_policy = udp_timeout_nla_policy, - }, --#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ -+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ - .init_net = udp_init_net, - .get_net_proto = udp_get_net_proto, - }; -@@ -412,7 +412,7 @@ struct nf_conntrack_l4proto nf_conntrack - .nlattr_tuple_size = nf_ct_port_nlattr_tuple_size, - .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 = udp_timeout_nlattr_to_obj, - .obj_to_nlattr = udp_timeout_obj_to_nlattr, -@@ -420,7 +420,7 @@ struct nf_conntrack_l4proto nf_conntrack - .obj_size = sizeof(unsigned int) * CTA_TIMEOUT_UDP_MAX, - .nla_policy = udp_timeout_nla_policy, - }, --#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ -+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ - .init_net = udp_init_net, - .get_net_proto = udp_get_net_proto, - }; diff --git a/queue-4.14/series b/queue-4.14/series index 32738b8f166..799ba098278 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -63,7 +63,6 @@ net-ena-fix-driver-when-page_size-64kb.patch net-ena-fix-missing-calls-to-read_once.patch perf-x86-intel-add-support-quirk-for-the-mispredict-bit-on-knights-landing-cpus.patch dm-thin-metadata-try-to-avoid-ever-aborting-transactions.patch -netfilter-conntrack-timeout-interface-depend-on-config_nf_conntrack_timeout.patch arch-hexagon-fix-kernel-dma.c-build-warning.patch hexagon-modify-ffs-and-fls-to-return-int.patch arm64-jump_label.h-use-asm_volatile_goto-macro-instead-of-asm-goto.patch diff --git a/queue-4.18/netfilter-conntrack-timeout-interface-depend-on-config_nf_conntrack_timeout.patch b/queue-4.18/netfilter-conntrack-timeout-interface-depend-on-config_nf_conntrack_timeout.patch deleted file mode 100644 index a37df534a12..00000000000 --- a/queue-4.18/netfilter-conntrack-timeout-interface-depend-on-config_nf_conntrack_timeout.patch +++ /dev/null @@ -1,448 +0,0 @@ -From foo@baz Mon Oct 8 17:39:53 CEST 2018 -From: Pablo Neira Ayuso -Date: Fri, 31 Aug 2018 12:36:01 +0200 -Subject: netfilter: conntrack: timeout interface depend on CONFIG_NF_CONNTRACK_TIMEOUT - -From: Pablo Neira Ayuso - -[ 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 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: Pablo Neira Ayuso -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 8 ++++---- - net/ipv6/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(-) - ---- 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_si - } - #endif - --#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT) -+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT - - #include - #include -@@ -307,7 +307,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[] = { -@@ -369,7 +369,7 @@ const struct nf_conntrack_l4proto nf_con - .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, -@@ -377,7 +377,7 @@ const struct nf_conntrack_l4proto nf_con - .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, - }; ---- 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_ - } - #endif - --#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT) -+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT - - #include - #include -@@ -308,7 +308,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[] = { -@@ -368,7 +368,7 @@ const struct nf_conntrack_l4proto nf_con - .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, -@@ -376,7 +376,7 @@ const struct nf_conntrack_l4proto nf_con - .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, - }; ---- 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 - } - #endif - --#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT) -+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT - - #include - #include -@@ -750,7 +750,7 @@ dccp_timeout_nla_policy[CTA_TIMEOUT_DCCP - [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 */ -@@ -883,7 +883,7 @@ const struct nf_conntrack_l4proto nf_con - .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, -@@ -891,7 +891,7 @@ const struct nf_conntrack_l4proto nf_con - .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, - }; -@@ -919,7 +919,7 @@ const struct nf_conntrack_l4proto nf_con - .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, -@@ -927,7 +927,7 @@ const struct nf_conntrack_l4proto nf_con - .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, - }; ---- 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 * - return ret; - } - --#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT) -+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT - - #include - #include -@@ -119,7 +119,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[] = { -@@ -172,7 +172,7 @@ const struct nf_conntrack_l4proto nf_con - .packet = generic_packet, - .get_timeouts = generic_get_timeouts, - .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, -@@ -180,7 +180,7 @@ const struct nf_conntrack_l4proto nf_con - .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, - }; ---- 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 * - nf_ct_gre_keymap_destroy(master); - } - --#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT) -+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT - - #include - #include -@@ -336,7 +336,7 @@ gre_timeout_nla_policy[CTA_TIMEOUT_GRE_M - [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) - { -@@ -371,7 +371,7 @@ static const struct nf_conntrack_l4proto - .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, -@@ -379,7 +379,7 @@ static const struct nf_conntrack_l4proto - .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, - }; ---- 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 - } - #endif - --#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT) -+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT - - #include - #include -@@ -668,7 +668,7 @@ sctp_timeout_nla_policy[CTA_TIMEOUT_SCTP - [CTA_TIMEOUT_SCTP_HEARTBEAT_SENT] = { .type = NLA_U32 }, - [CTA_TIMEOUT_SCTP_HEARTBEAT_ACKED] = { .type = NLA_U32 }, - }; --#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ -+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ - - - #ifdef CONFIG_SYSCTL -@@ -800,7 +800,7 @@ const struct nf_conntrack_l4proto nf_con - .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 = sctp_timeout_nlattr_to_obj, - .obj_to_nlattr = sctp_timeout_obj_to_nlattr, -@@ -808,7 +808,7 @@ const struct nf_conntrack_l4proto nf_con - .obj_size = sizeof(unsigned int) * SCTP_CONNTRACK_MAX, - .nla_policy = sctp_timeout_nla_policy, - }, --#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ -+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ - .init_net = sctp_init_net, - .get_net_proto = sctp_get_net_proto, - }; -@@ -836,7 +836,8 @@ const struct nf_conntrack_l4proto nf_con - .nlattr_tuple_size = nf_ct_port_nlattr_tuple_size, - .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, - .nla_policy = nf_ct_port_nla_policy, --#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT) -+#endif -+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT - .ctnl_timeout = { - .nlattr_to_obj = sctp_timeout_nlattr_to_obj, - .obj_to_nlattr = sctp_timeout_obj_to_nlattr, -@@ -844,8 +845,7 @@ const struct nf_conntrack_l4proto nf_con - .obj_size = sizeof(unsigned int) * SCTP_CONNTRACK_MAX, - .nla_policy = sctp_timeout_nla_policy, - }, --#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ --#endif -+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ - .init_net = sctp_init_net, - .get_net_proto = sctp_get_net_proto, - }; ---- 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_siz - } - #endif - --#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT) -+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT - - #include - #include -@@ -1415,7 +1415,7 @@ static const struct nla_policy tcp_timeo - [CTA_TIMEOUT_TCP_RETRANS] = { .type = NLA_U32 }, - [CTA_TIMEOUT_TCP_UNACK] = { .type = NLA_U32 }, - }; --#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ -+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ - - #ifdef CONFIG_SYSCTL - static struct ctl_table tcp_sysctl_table[] = { -@@ -1578,7 +1578,7 @@ const struct nf_conntrack_l4proto nf_con - .nlattr_size = TCP_NLATTR_SIZE, - .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 = tcp_timeout_nlattr_to_obj, - .obj_to_nlattr = tcp_timeout_obj_to_nlattr, -@@ -1587,7 +1587,7 @@ const struct nf_conntrack_l4proto nf_con - TCP_CONNTRACK_TIMEOUT_MAX, - .nla_policy = tcp_timeout_nla_policy, - }, --#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ -+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ - .init_net = tcp_init_net, - .get_net_proto = tcp_get_net_proto, - }; -@@ -1616,7 +1616,7 @@ const struct nf_conntrack_l4proto nf_con - .nlattr_tuple_size = tcp_nlattr_tuple_size, - .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 = tcp_timeout_nlattr_to_obj, - .obj_to_nlattr = tcp_timeout_obj_to_nlattr, -@@ -1625,7 +1625,7 @@ const struct nf_conntrack_l4proto nf_con - TCP_CONNTRACK_TIMEOUT_MAX, - .nla_policy = tcp_timeout_nla_policy, - }, --#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ -+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ - .init_net = tcp_init_net, - .get_net_proto = tcp_get_net_proto, - }; ---- 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, st - return NF_ACCEPT; - } - --#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT) -+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT - - #include - #include -@@ -239,7 +239,7 @@ udp_timeout_nla_policy[CTA_TIMEOUT_UDP_M - [CTA_TIMEOUT_UDP_UNREPLIED] = { .type = NLA_U32 }, - [CTA_TIMEOUT_UDP_REPLIED] = { .type = NLA_U32 }, - }; --#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ -+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ - - #ifdef CONFIG_SYSCTL - static struct ctl_table udp_sysctl_table[] = { -@@ -313,7 +313,7 @@ const struct nf_conntrack_l4proto nf_con - .nlattr_tuple_size = nf_ct_port_nlattr_tuple_size, - .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 = udp_timeout_nlattr_to_obj, - .obj_to_nlattr = udp_timeout_obj_to_nlattr, -@@ -321,7 +321,7 @@ const struct nf_conntrack_l4proto nf_con - .obj_size = sizeof(unsigned int) * CTA_TIMEOUT_UDP_MAX, - .nla_policy = udp_timeout_nla_policy, - }, --#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ -+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ - .init_net = udp_init_net, - .get_net_proto = udp_get_net_proto, - }; -@@ -345,7 +345,7 @@ const struct nf_conntrack_l4proto nf_con - .nlattr_tuple_size = nf_ct_port_nlattr_tuple_size, - .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 = udp_timeout_nlattr_to_obj, - .obj_to_nlattr = udp_timeout_obj_to_nlattr, -@@ -353,7 +353,7 @@ const struct nf_conntrack_l4proto nf_con - .obj_size = sizeof(unsigned int) * CTA_TIMEOUT_UDP_MAX, - .nla_policy = udp_timeout_nla_policy, - }, --#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ -+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ - .init_net = udp_init_net, - .get_net_proto = udp_get_net_proto, - }; -@@ -377,7 +377,7 @@ const struct nf_conntrack_l4proto nf_con - .nlattr_tuple_size = nf_ct_port_nlattr_tuple_size, - .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 = udp_timeout_nlattr_to_obj, - .obj_to_nlattr = udp_timeout_obj_to_nlattr, -@@ -385,7 +385,7 @@ const struct nf_conntrack_l4proto nf_con - .obj_size = sizeof(unsigned int) * CTA_TIMEOUT_UDP_MAX, - .nla_policy = udp_timeout_nla_policy, - }, --#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ -+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ - .init_net = udp_init_net, - .get_net_proto = udp_get_net_proto, - }; -@@ -409,7 +409,7 @@ const struct nf_conntrack_l4proto nf_con - .nlattr_tuple_size = nf_ct_port_nlattr_tuple_size, - .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 = udp_timeout_nlattr_to_obj, - .obj_to_nlattr = udp_timeout_obj_to_nlattr, -@@ -417,7 +417,7 @@ const struct nf_conntrack_l4proto nf_con - .obj_size = sizeof(unsigned int) * CTA_TIMEOUT_UDP_MAX, - .nla_policy = udp_timeout_nla_policy, - }, --#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ -+#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ - .init_net = udp_init_net, - .get_net_proto = udp_get_net_proto, - }; diff --git a/queue-4.18/series b/queue-4.18/series index a167f2751fe..21d649cb8a3 100644 --- a/queue-4.18/series +++ b/queue-4.18/series @@ -123,7 +123,6 @@ net-ena-fix-missing-calls-to-read_once.patch perf-x86-intel-add-support-quirk-for-the-mispredict-bit-on-knights-landing-cpus.patch sched-topology-set-correct-numa-topology-type.patch dm-thin-metadata-try-to-avoid-ever-aborting-transactions.patch -netfilter-conntrack-timeout-interface-depend-on-config_nf_conntrack_timeout.patch netfilter-nfnetlink_queue-solve-the-nfqueue-conntrack-clash-for-nf_repeat.patch netfilter-xt_hashlimit-use-s-file-instead-of-s-private.patch arch-hexagon-fix-kernel-dma.c-build-warning.patch