Vishwanath Pai 596cf3fe58
netfilter: ipset: fix race condition in ipset save, swap and delete ...
This fix adds a new reference counter (ref_netlink) for the struct ip_set.
The other reference counter (ref) can be swapped out by ip_set_swap and we
need a separate counter to keep track of references for netlink events
like dump. Using the same ref counter for dump causes a race condition
which can be demonstrated by the following script:
ipset create hash_ip1 hash:ip family inet hashsize 1024 maxelem 500000 \
counters
ipset create hash_ip2 hash:ip family inet hashsize 300000 maxelem 500000 \
counters
ipset create hash_ip3 hash:ip family inet hashsize 1024 maxelem 500000 \
counters
ipset save &
ipset swap hash_ip3 hash_ip2
ipset destroy hash_ip3 /* will crash the machine */
Swap will exchange the values of ref so destroy will see ref = 0 instead of
ref = 1. With this fix in place swap will not succeed because ipset save
still has ref_netlink on the set (ip_set_swap doesn't swap ref_netlink).
Both delete and swap will error out if ref_netlink != 0 on the set.
Note: The changes to *_head functions is because previously we would
increment ref whenever we called these functions, we don't do that
anymore.
Reviewed-by: Joshua Hunt <johunt@akamai.com >
Signed-off-by: Vishwanath Pai <vpai@akamai.com >
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu >
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org >
2016-03-28 17:57:45 +02:00
2016-02-20 14:11:01 -08:00
2016-03-07 14:41:08 +02:00
2016-03-04 21:00:37 +01:00
2016-03-23 06:06:45 -07:00
2016-02-04 18:25:55 +01:00
2016-03-04 23:50:27 -06:00
2016-02-23 19:40:33 +05:30
2015-11-21 18:42:00 +01:00
2016-02-17 21:11:08 +00:00
2016-01-27 14:32:48 -08:00
2016-02-25 10:56:58 +01:00
2016-01-07 10:10:50 -05:00
2016-03-21 14:35:52 -07:00
2016-03-19 10:05:34 -07:00
2016-03-22 15:48:44 -07:00
2016-02-29 11:03:10 +01:00
2016-01-07 09:55:39 -08:00
2016-03-28 17:57:45 +02:00
2016-03-02 20:05:23 +01:00
2016-03-02 20:05:23 +01:00
2016-03-02 20:05:23 +01:00
2016-02-26 14:37:06 +00:00
2015-12-21 14:26:28 +05:30
2015-10-27 11:24:23 +01:00
2016-03-20 14:57:08 -07:00
2016-03-17 12:50:55 -07:00
2016-03-07 15:01:39 -05:00
2016-01-21 14:47:08 -08:00
2016-03-13 15:19:35 +07:00
2016-03-17 15:09:34 -07:00
2016-03-23 06:09:15 -07:00
2016-03-17 21:51:52 -07:00
2015-12-16 16:36:25 +02:00
2016-03-24 10:41:00 -07:00
2016-03-17 15:09:34 -07:00
2016-03-05 12:05:01 -08:00
2016-01-12 01:10:19 +01:00
2015-12-23 08:37:10 -07:00
2016-02-11 09:23:59 +01:00
2016-01-04 16:19:57 +00:00
2016-02-11 10:07:18 -05:00
2016-03-07 16:11:14 -08:00
2016-01-14 13:40:30 +01:00
2016-03-19 15:38:41 -07:00
2016-01-27 16:41:04 -08:00
2016-03-15 16:55:16 -07:00
2016-03-15 16:55:16 -07:00
2015-11-05 14:51:32 -08:00
2016-01-09 08:39:04 -08:00
2015-12-13 15:55:55 +01:00
2016-01-24 03:47:37 +01:00
2016-01-24 03:49:03 +01:00
2016-03-12 14:12:10 -07:00
2016-02-19 22:54:09 -05:00
2015-12-09 10:35:16 -08:00
2015-12-22 09:38:34 -07:00
2015-10-27 15:04:56 +09:00
2016-02-09 12:42:17 -07:00
2016-03-19 18:52:29 -07:00
2015-12-06 12:46:31 +01:00
2016-03-08 15:28:31 -05:00
2016-03-25 11:37:57 -04:00
2016-03-17 15:09:34 -07:00
2016-03-03 21:18:29 +11:00
2016-02-22 08:51:38 +01:00
2016-03-22 15:36:02 -07:00
2016-03-11 21:19:16 +08:00
2015-12-03 10:24:08 -05:00
2016-03-16 13:31:46 -07:00
2016-02-16 13:04:58 -05:00
2016-01-27 09:10:29 -05:00
2016-02-26 16:01:32 -08:00
2016-02-16 16:34:18 +00:00
2016-01-27 12:38:03 +01:00
2016-02-27 08:55:30 +01:00
2015-10-23 17:55:10 +09:00
2016-03-17 15:09:34 -07:00
2016-03-22 15:36:02 -07:00
2015-11-06 17:50:42 -08:00
2016-03-15 09:01:06 +01:00
2015-12-07 00:02:05 +00:00
2016-03-06 16:11:24 +01:00
2016-01-16 11:17:25 -08:00
2015-11-24 09:56:43 +01:00
2015-12-04 10:34:45 +01:00
2016-02-20 14:11:01 -08:00
2016-02-20 14:11:01 -08:00
2016-03-01 20:36:58 +01:00
2016-03-10 20:46:03 +01:00
2016-03-01 20:36:58 +01:00
2016-03-22 15:36:02 -07:00
2016-01-22 10:22:46 -05:00
2016-03-22 15:36:02 -07:00
2016-02-06 15:33:20 +08:00
2016-03-01 16:55:48 -08:00
2016-02-27 10:28:52 -08:00
2015-11-16 09:27:32 +05:30
2016-03-21 11:03:02 -07:00
2016-02-07 22:26:47 -08:00
2015-12-30 13:01:03 -05:00
2015-11-02 13:14:44 -08:00
2016-01-13 17:30:32 +09:00
2016-03-10 17:12:09 -05:00
2016-03-23 06:06:45 -07:00
2016-02-06 23:45:46 -08:00
2016-02-11 15:33:38 +00:00
2016-02-09 09:25:22 +01:00
2015-10-23 17:55:10 +09:00
2016-03-20 13:28:18 -07:00
2016-03-14 11:18:12 +05:30
2016-01-15 22:08:45 +01:00
2015-11-18 16:27:46 -05:00
2016-02-09 13:05:23 +01:00
2015-11-25 09:22:00 -07:00
2015-11-25 09:22:02 -07:00
2015-12-11 16:56:40 +01:00
2016-02-11 19:23:28 -08:00
2016-03-20 18:58:18 -07:00
2015-12-11 11:05:57 -08:00
2016-01-16 11:17:24 -08:00
2016-01-06 16:31:56 -05:00
2016-02-25 22:06:47 -05:00
2015-12-15 08:53:36 -05:00
2016-02-25 22:12:26 -08:00
2016-02-22 21:39:53 -08:00
2016-03-15 16:55:16 -07:00
2016-02-26 13:28:35 +02:00
2015-10-31 16:12:10 -07:00
2016-02-07 17:34:58 -08:00
2016-01-08 21:40:34 -05:00
2016-02-29 08:35:10 +01:00
2016-03-17 15:09:34 -07:00
2016-03-22 15:36:02 -07:00
2016-03-21 11:03:02 -07:00
2016-03-19 18:52:29 -07:00
2016-03-14 00:17:28 -04:00
2016-02-29 09:53:10 +01:00
2015-11-04 18:10:13 -08:00
2015-12-22 17:10:17 -06:00
2016-01-09 22:42:31 -08:00
2016-03-17 15:09:34 -07:00
2016-02-20 12:53:31 +01:00
2015-11-18 16:17:42 -05:00
2015-12-05 17:41:42 -05:00
2015-12-28 13:41:50 +01:00
2015-11-09 15:11:24 -08:00
2016-03-17 15:09:34 -07:00
2016-03-19 15:38:41 -07:00
2015-11-06 17:50:42 -08:00
2016-01-15 17:56:32 -08:00
2016-03-01 16:57:20 -08:00
2016-01-13 11:06:03 +01:00
2015-11-25 09:22:00 -07:00
2016-02-24 09:04:20 +01:00
2016-03-11 14:58:58 -05:00
2015-10-23 05:44:28 -07:00
2015-11-20 11:31:26 -05:00
2016-02-06 02:59:51 -05:00
2015-12-15 16:50:20 -05:00
2016-02-11 09:59:22 -05:00
2016-02-21 09:06:12 -05:00
2015-12-15 23:26:51 -05:00
2015-12-04 10:34:46 +01:00
2016-02-22 08:51:37 +01:00
2016-02-15 12:42:38 +00:00
2015-10-27 08:36:08 +09:00
2016-03-09 01:23:35 +01:00
2016-03-22 15:36:02 -07:00
2015-11-04 11:30:57 -08:00
2016-01-29 12:34:29 +01:00
2016-03-16 17:45:56 -07:00
2016-02-25 21:45:15 -05:00
2015-12-11 11:52:29 -08:00
2016-03-15 12:48:48 -07:00
2015-12-14 10:03:46 +01:00
2016-03-17 22:13:41 -07:00
2015-10-30 10:13:26 +01:00
2016-03-14 10:30:57 -04:00
2016-01-28 14:19:12 -08:00
2016-02-22 23:19:09 -05:00
2015-11-23 09:44:58 +01:00
2016-03-09 15:43:42 -08:00
2016-03-22 15:36:02 -07:00
2016-01-16 11:17:23 -08:00
2016-03-24 10:52:25 -07:00
2016-02-16 13:04:58 -05:00
2016-01-20 17:09:18 -08:00
2016-02-09 16:40:46 +00:00
2016-03-22 15:36:02 -07:00
2015-12-12 10:15:34 -08:00
2015-11-28 19:33:29 -08:00
2016-02-25 11:27:16 +01:00
2015-11-25 17:24:23 +01:00
2016-01-15 17:56:32 -08:00
2016-02-09 11:54:23 +01:00
2016-03-14 09:22:20 +01:00
2016-02-25 16:37:06 -05:00
2016-03-05 12:24:06 -08:00
2016-03-18 17:13:31 -07:00
2016-03-17 15:09:34 -07:00
2016-01-20 17:09:18 -08:00
2015-11-23 10:37:35 -08:00
2016-03-09 15:43:42 -08:00
2016-03-17 09:45:10 +01:00
2016-02-11 18:35:48 -08:00
2015-11-25 09:22:02 -07:00
2016-02-21 09:06:12 -05:00
2016-01-20 17:09:18 -08:00
2015-11-17 15:25:43 -05:00
2015-11-10 12:06:16 +01:00
2016-02-22 22:44:04 -05:00
2016-03-14 12:19:46 -04:00
2016-01-07 14:31:27 -05:00
2016-01-15 17:56:32 -08:00
2016-03-17 15:09:34 -07:00
2016-03-15 16:55:16 -07:00
2016-03-17 13:47:50 -07:00
2016-01-14 16:00:49 -08:00
2016-01-15 17:56:32 -08:00
2016-03-15 16:55:16 -07:00
2015-10-27 18:55:31 -07:00
2016-03-20 16:47:13 -04:00
2016-01-14 16:00:49 -08:00
2016-02-18 09:28:03 +01:00
2016-03-20 19:08:56 -07:00
2016-02-18 19:46:30 +01:00
2016-03-15 16:55:16 -07:00
2016-03-17 15:09:34 -07:00
2015-12-14 19:15:05 -08:00
2016-02-03 16:58:15 +10:30
2015-11-06 17:50:42 -08:00
2015-11-30 15:26:22 -05:00
2016-02-07 19:10:12 -08:00
2016-03-14 00:15:46 -04:00
2016-03-05 12:24:06 -08:00
2016-03-09 16:36:13 -05:00
2016-02-17 09:47:36 -05:00
2016-03-23 23:25:14 -07:00
2015-11-06 19:33:12 +01:00
2016-03-02 20:05:26 +01:00
2016-02-18 11:42:22 -05:00
2016-01-14 16:08:23 -08:00
2015-12-28 09:57:15 -05:00
2016-02-08 15:20:01 -05:00
2016-02-17 11:44:45 -05:00
2016-03-23 12:34:17 +01:00
2016-03-01 20:36:58 +01:00
2016-02-16 13:04:58 -05:00
2015-12-01 10:59:38 -07:00
2016-03-01 16:55:48 -08:00
2015-12-17 10:43:06 -06:00
2015-11-16 09:03:21 +05:30
2016-02-06 22:07:37 -08:00
2016-01-05 11:20:12 +01:00
2015-12-09 09:23:28 -06:00
2016-01-15 12:30:35 -06:00
2016-03-19 15:15:07 -07:00
2015-12-18 11:17:26 +05:30
2016-02-08 16:22:03 +02:00
2015-11-05 19:34:48 -08:00
2016-03-15 16:55:16 -07:00
2016-03-15 16:55:16 -07:00
2016-03-17 15:09:34 -07:00
2016-03-17 15:09:34 -07:00
2016-03-17 15:09:34 -07:00
2015-11-06 17:50:42 -08:00
2016-03-17 15:09:34 -07:00
2016-03-15 08:52:28 -05:00
2016-03-07 11:39:16 -06:00
2016-03-19 15:38:41 -07:00
2015-11-16 10:40:50 -05:00
2015-11-16 10:50:25 -05:00
2016-03-24 10:02:14 -07:00
2016-02-11 18:35:48 -08:00
2016-02-11 18:35:48 -08:00
2016-03-14 15:43:11 -04:00
2016-03-13 22:11:43 -04:00
2015-11-30 15:26:22 -05:00
2016-01-19 19:25:21 -05:00
2016-02-18 19:46:33 +01:00
2016-01-12 20:25:09 -08:00
2016-02-15 23:18:15 +01:00
2016-02-10 01:11:54 +01:00
2015-12-21 03:11:12 +01:00
2016-01-08 01:12:06 +01:00
2016-03-09 15:15:32 -08:00
2016-03-15 16:55:16 -07:00
2016-03-17 15:09:34 -07:00
2015-12-06 21:25:17 -05:00
2016-03-02 16:44:27 +01:00
2016-02-15 07:02:32 +01:00
2016-01-02 00:29:35 +01:00
2016-03-02 17:13:02 -08:00
2016-01-16 11:17:29 -08:00
2016-02-16 13:04:58 -05:00
2016-01-01 02:09:51 +01:00
2015-11-23 09:44:58 +01:00
2016-02-11 15:33:38 +00:00
2016-03-10 09:43:36 -08:00
2015-10-22 08:59:18 -07:00
2015-11-03 11:08:22 -05:00
2016-03-03 14:23:43 -08:00
2016-01-20 17:09:18 -08:00
2015-11-10 13:06:16 +01:00
2016-02-09 19:01:11 +00:00
2016-03-17 15:09:34 -07:00
2016-02-09 13:05:23 +01:00
2016-02-09 13:05:23 +01:00
2016-03-17 15:09:34 -07:00
2016-02-27 10:28:52 -08:00
2016-01-20 17:09:18 -08:00
2016-03-09 16:36:13 -05:00
2016-03-15 13:50:29 -07:00
2015-12-07 17:01:31 -08:00
2015-12-07 17:01:31 -08:00
2016-03-05 21:30:41 +09:00
2016-01-25 10:58:44 +01:00
2015-11-16 09:23:47 +01:00
2016-02-24 09:12:45 +01:00
2015-12-17 22:08:28 -05:00
2015-11-02 14:23:38 -05:00
2016-03-22 15:36:02 -07:00
2016-03-22 15:36:02 -07:00
2016-03-22 15:36:02 -07:00
2016-03-22 15:36:02 -07:00
2016-03-17 15:09:34 -07:00
2016-03-10 16:04:24 -08:00
2016-03-14 17:08:15 +01:00
2016-01-10 22:13:15 -05:00
2015-12-15 09:41:09 +01:00
2016-03-22 15:36:02 -07:00
2016-02-16 09:26:27 +00:00
2015-10-27 19:55:13 -07:00
2016-02-21 09:06:12 -05:00
2016-02-06 22:23:26 -08:00
2016-02-06 22:07:37 -08:00
2015-12-17 11:18:44 +01:00
2015-11-24 11:48:35 +09:00
2016-01-04 16:11:11 -05:00
2016-01-20 17:09:18 -08:00
2016-01-22 18:08:52 -05:00
2015-11-20 16:17:32 -08:00
2016-03-08 12:34:12 -05:00
2016-03-15 16:55:16 -07:00
2016-03-15 16:55:16 -07:00
2016-03-15 16:55:16 -07:00
2015-12-15 23:26:51 -05:00
2016-03-09 16:36:14 -05:00
2016-02-23 19:59:55 -08:00
2016-02-20 14:09:14 -08:00
2016-03-08 12:34:12 -05:00
2016-01-06 11:02:29 +01:00
2016-03-17 15:09:34 -07:00
2015-10-26 10:11:58 +09:00
2016-02-25 11:27:16 +01:00
2016-01-20 17:09:18 -08:00
2016-01-20 17:29:52 -05:00
2016-03-04 12:20:10 -05:00
2015-11-13 21:53:18 -08:00
2016-03-14 14:55:26 -04:00
2016-03-18 14:10:57 +08:00
2016-01-14 16:00:49 -08:00
2016-03-17 15:09:34 -07:00
2015-12-10 22:41:06 -08:00
2016-03-02 17:13:17 -08:00
2016-03-02 17:13:17 -08:00
2016-01-18 14:49:33 -05:00
2016-03-24 10:52:25 -07:00
2015-11-05 19:34:48 -08:00
2016-03-15 16:55:16 -07:00
2016-03-09 11:58:41 -05:00
2016-01-28 11:58:02 -08:00
2016-01-28 14:13:44 -08:00
2015-11-25 15:49:13 +00:00
2015-12-17 09:57:27 -08:00
2016-02-10 13:19:03 +00:00
2015-12-18 17:48:50 -08:00
2015-12-06 20:42:15 -05:00
2015-11-23 09:44:58 +01:00
2016-02-14 17:03:23 -08:00
2016-02-22 16:10:08 -07:00
2016-02-09 11:21:07 +01:00
2015-12-04 10:38:59 -02:00
2016-01-12 20:47:06 +02:00
2016-03-02 17:01:57 +02:00
2016-03-02 17:01:57 +02:00
2016-03-17 15:09:34 -07:00
2016-01-14 16:00:49 -08:00
2016-01-14 16:00:49 -08:00
2016-01-14 16:00:49 -08:00
2016-02-07 21:36:02 -08:00
2015-12-04 10:34:45 +01:00
2016-02-24 09:09:45 +01:00
2016-03-16 21:11:19 +01:00
2015-12-03 07:24:29 -08:00
2016-01-29 13:31:10 -05:00
2016-03-03 14:42:50 -07:00
2015-12-13 19:46:12 -05:00
2015-11-06 17:50:42 -08:00
2015-11-06 17:50:42 -08:00
2015-11-06 17:50:42 -08:00
596cf3fe58