Pan Bian 1231e259d4 netfilter: ipset: do not call ipset_nest_end after nla_nest_cancel ...

[ Upstream commit 708abf74dd ]

In the error handling block, nla_nest_cancel(skb, atd) is called to
cancel the nest operation. But then, ipset_nest_end(skb, atd) is
unexpected called to end the nest operation. This patch calls the
ipset_nest_end only on the branch that nla_nest_cancel is not called.

Fixes: 45040978c8 ("netfilter: ipset: Fix set:list type crash when flush/dump set in parallel")
Signed-off-by: Pan Bian <bianpan2016@163.com>
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

2019-01-13 10:03:48 +01:00

..

ip_set_bitmap_gen.h

netfilter: ipset: fix race condition in ipset save, swap and delete

2016-03-28 17:57:45 +02:00

ip_set_bitmap_ip.c

netfilter: ipset: Fix extension alignment

2015-11-07 11:21:47 +01:00

ip_set_bitmap_ipmac.c

netfilter: ipset: Check IPSET_ATTR_ETHER netlink attribute length

2016-03-08 20:36:17 +01:00

ip_set_bitmap_port.c

netfilter: ipset: Fix extension alignment

2015-11-07 11:21:47 +01:00

ip_set_core.c

netfilter: ipset: fix race condition in ipset save, swap and delete

2016-03-28 17:57:45 +02:00

ip_set_getport.c

netfilter: ipset: Fix coding styles reported by checkpatch.pl

2015-06-14 10:40:18 +02:00

ip_set_hash_gen.h

netfilter: ipset: fix race condition in ipset save, swap and delete

2016-03-28 17:57:45 +02:00

ip_set_hash_ip.c

netfilter: ipset: Fix coding styles reported by checkpatch.pl

2015-06-14 10:40:18 +02:00

ip_set_hash_ipmark.c

netfilter: ipset: Fix coding styles reported by checkpatch.pl

2015-06-14 10:40:18 +02:00

ip_set_hash_ipport.c

netfilter: ipset: Fix coding styles reported by checkpatch.pl

2015-06-14 10:40:18 +02:00

ip_set_hash_ipportip.c

netfilter: ipset: Fix coding styles reported by checkpatch.pl

2015-06-14 10:40:18 +02:00

ip_set_hash_ipportnet.c

netfilter: ipset: Fix coding styles reported by checkpatch.pl

2015-06-14 10:40:18 +02:00

ip_set_hash_mac.c

netfilter: ipset: Check IPSET_ATTR_ETHER netlink attribute length

2016-03-08 20:36:17 +01:00

ip_set_hash_net.c

netfilter: ipset: Fix coding styles reported by checkpatch.pl

2015-06-14 10:40:18 +02:00

ip_set_hash_netiface.c

netfilter: ipset: allow a 0 netmask with hash_netiface type

2016-01-13 14:03:43 +01:00

ip_set_hash_netnet.c

netfilter: ipset: Fixing unnamed union init

2015-08-29 01:02:28 +02:00

ip_set_hash_netport.c

netfilter: ipset: Fix coding styles reported by checkpatch.pl

2015-06-14 10:40:18 +02:00

ip_set_hash_netportnet.c

netfilter: ipset: actually allow allowable CIDR 0 in hash:net,port,net

2018-11-27 16:09:39 +01:00

ip_set_list_set.c

netfilter: ipset: do not call ipset_nest_end after nla_nest_cancel

2019-01-13 10:03:48 +01:00

Kconfig

netfilter: ipset: hash:mac type added to ipset

2014-09-15 22:20:21 +02:00

Makefile

netfilter: ipset: hash:mac type added to ipset

2014-09-15 22:20:21 +02:00

pfxlen.c

netfilter: ipset: Fix coding styles reported by checkpatch.pl

2015-06-14 10:40:18 +02:00