Daniel Borkmann
62da98656b
netfilter: nf_conntrack: make nf_ct_zone_dflt built-in ...
Fengguang reported, that some randconfig generated the following linker
issue with nf_ct_zone_dflt object involved:
[...]
CC init/version.o
LD init/built-in.o
net/built-in.o: In function `ipv4_conntrack_defrag':
nf_defrag_ipv4.c:(.text+0x93e95): undefined reference to `nf_ct_zone_dflt'
net/built-in.o: In function `ipv6_defrag':
nf_defrag_ipv6_hooks.c:(.text+0xe3ffe): undefined reference to `nf_ct_zone_dflt'
make: *** [vmlinux] Error 1
Given that configurations exist where we have a built-in part, which is
accessing nf_ct_zone_dflt such as the two handlers nf_ct_defrag_user()
and nf_ct6_defrag_user(), and a part that configures nf_conntrack as a
module, we must move nf_ct_zone_dflt into a fixed, guaranteed built-in
area when netfilter is configured in general.
Therefore, split the more generic parts into a common header under
include/linux/netfilter/ and move nf_ct_zone_dflt into the built-in
section that already holds parts related to CONFIG_NF_CONNTRACK in the
netfilter core. This fixes the issue on my side.
Fixes: 308ac9143ee2 ("netfilter: nf_conntrack: push zone object into functions")
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-02 16:32:56 -07:00
2015-04-11 22:28:27 -04:00
2015-08-10 21:36:13 +02:00
2015-02-20 17:35:14 -05:00
2014-12-10 15:33:16 -05:00
2013-04-08 17:16:57 -04:00
2015-09-02 16:32:56 -07:00
2015-08-04 23:57:45 -07:00
2015-08-20 22:00:11 +02:00
2012-06-17 16:29:38 -07:00
2015-06-14 12:55:49 -07:00
2015-08-26 11:01:45 -07:00
2015-08-11 22:05:36 +02:00
2015-08-26 11:01:44 -07:00
2015-07-31 15:21:30 -07:00
2014-10-25 08:07:30 +02:00
2013-07-31 17:50:01 -07:00
2015-06-10 22:49:20 -07:00
2015-05-11 10:50:17 -04:00
2014-09-18 10:54:36 +02:00
2015-03-04 00:23:23 -05:00
2011-11-30 18:51:03 -05:00
2015-06-28 16:55:44 -07:00
2009-03-24 23:32:03 -07:00
2015-02-24 16:05:48 -05:00
2014-11-10 13:27:49 -05:00
2015-07-27 01:05:24 -07:00
2015-05-11 10:59:32 -04:00
2014-01-13 17:39:11 +01:00
2011-08-08 14:26:29 -04:00
2015-07-17 15:39:41 +02:00
2015-08-10 20:43:06 +02:00
2015-08-17 21:33:06 -07:00
2015-02-11 14:46:37 -05:00
2015-07-20 12:41:30 -07:00
2015-05-13 14:31:43 -04:00
2015-04-09 00:02:26 -04:00
2014-02-09 17:32:50 -08:00
2013-12-06 12:37:56 -05:00
2015-03-06 21:50:02 -05:00
2013-12-10 21:50:00 -05:00
2013-09-20 14:49:32 -04:00
2015-04-07 15:25:55 -04:00
2013-09-20 14:49:32 -04:00
2014-02-09 17:32:49 -08:00
2014-02-09 17:32:49 -08:00
2015-08-18 14:17:21 -07:00
2013-01-09 23:59:53 -08:00
2015-08-31 21:23:42 -07:00
2015-03-09 16:06:10 -04:00
2015-08-31 12:34:00 -07:00
2013-11-07 19:28:58 -05:00
2014-02-04 20:19:51 -08:00
2015-07-21 10:39:06 -07:00
2013-03-26 12:32:13 -04:00
2015-09-01 16:46:08 -07:00
2015-09-01 21:19:17 -07:00
2014-02-12 07:02:11 +01:00
2014-11-12 15:01:35 -05:00
2013-09-20 14:49:33 -04:00
2014-09-30 01:02:26 -04:00
2015-03-12 14:39:40 -04:00
2015-08-27 15:42:48 -07:00
2015-08-10 14:03:54 -07:00
2015-08-31 15:17:17 -07:00
2014-11-05 16:30:03 -05:00
2013-09-20 14:49:33 -04:00
2014-02-06 09:34:58 +01:00
2015-06-12 11:42:29 +02:00
2015-03-23 22:12:09 -04:00
2015-03-20 12:40:25 -04:00
2015-03-18 22:00:35 -04:00
2015-05-11 10:50:18 -04:00
2015-05-31 21:49:14 -07:00
2014-05-07 15:30:52 -04:00
2015-07-26 21:00:15 -07:00
2015-07-09 15:12:20 -07:00
2015-06-06 23:57:12 -07:00
2015-07-09 15:12:20 -07:00
2015-08-28 13:32:36 -07:00
2014-08-24 18:09:23 -07:00
2015-08-20 15:42:36 -07:00
2015-05-25 13:25:34 -04:00
2015-04-07 15:29:08 -04:00
2015-07-31 23:52:20 -07:00
2015-08-31 12:28:56 -07:00
2015-08-21 09:10:11 -07:00
2015-08-30 21:48:58 -07:00
2010-02-16 23:05:38 -08:00
2015-07-31 17:07:12 -07:00
2014-11-24 04:28:49 -05:00
2015-02-28 21:31:12 +01:00
2013-09-21 14:01:38 -04:00
2014-10-14 02:18:27 +02:00
2013-09-21 14:01:38 -04:00
2013-09-21 14:01:38 -04:00
2014-12-10 15:21:24 -05:00
2015-05-11 10:50:17 -04:00
2013-09-21 14:01:38 -04:00
2014-01-01 22:22:43 -05:00
2013-09-21 14:01:38 -04:00
2013-09-21 14:01:38 -04:00
2014-12-10 15:21:24 -05:00
2013-09-21 14:01:38 -04:00
2014-01-03 20:56:48 -05:00
2015-08-24 10:34:40 -07:00
2015-08-13 11:31:45 +02:00
2015-07-23 17:10:50 +02:00
2013-12-06 12:37:56 -05:00
2014-09-22 16:23:15 -04:00
2015-07-21 10:39:05 -07:00
2014-11-05 23:52:33 -08:00
2013-10-01 17:06:14 -04:00
2015-08-20 15:42:37 -07:00
2015-08-10 13:46:21 -07:00
2015-08-07 11:50:56 +02:00
2011-05-27 13:41:33 -04:00
2013-09-21 14:01:39 -04:00
2014-08-07 20:55:21 -04:00
2015-03-31 13:58:35 -04:00
2014-02-08 10:36:58 -05:00
2013-09-21 14:01:39 -04:00
2015-08-10 20:43:06 +02:00
2013-09-21 14:01:39 -04:00
2015-03-02 13:06:31 -05:00
2014-10-06 18:02:32 -04:00
2015-08-27 14:18:48 -07:00
2014-05-23 16:28:53 -04:00
2013-09-23 01:51:08 -04:00
2013-09-23 01:51:08 -04:00
2013-09-23 01:51:08 -04:00
2014-01-21 23:17:20 -08:00
2014-12-17 11:49:55 +01:00
2015-05-05 16:02:34 -04:00
2013-09-23 01:51:08 -04:00
2015-09-01 14:32:44 -07:00
2015-07-21 10:39:07 -07:00
2015-08-27 17:14:30 -07:00
2013-09-23 01:51:09 -04:00
2014-06-02 11:00:41 -07:00
2014-10-15 07:48:18 +02:00
2015-07-31 23:52:20 -07:00
2013-12-19 18:51:20 -05:00
2013-09-23 01:51:09 -04:00
2015-08-11 12:03:19 -07:00
2013-10-21 18:43:02 -04:00
2015-03-12 22:58:12 -04:00
2015-08-31 12:34:00 -07:00
2015-07-09 15:12:20 -07:00
2014-01-19 19:53:18 -08:00
2014-05-22 14:57:15 -04:00
2015-08-29 13:07:54 -07:00
2015-03-02 13:06:31 -05:00
2015-02-04 01:34:15 -05:00
2015-09-01 14:32:44 -07:00
2013-07-27 22:14:06 -07:00
2015-08-25 14:32:04 -07:00
2013-09-23 16:29:40 -04:00
2014-09-05 17:35:28 -07:00
2013-09-23 16:29:41 -04:00
2010-04-22 16:12:36 -07:00
2015-08-11 12:41:35 +02:00
62da98656b