Commit 122ebbf2 authored by Jozsef Kadlecsik's avatar Jozsef Kadlecsik
Browse files

netfilter: ipset: Don't call ip_nest_end needlessly in the error path 



Suggested-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
parent 7722e0d1

net/netfilter/ipset/ip_set_bitmap_gen.h

+1 −1
Original line number Diff line number Diff line
@@ -228,11 +228,11 @@ mtype_list(const struct ip_set *set, 


nla_put_failure:

	nla_nest_cancel(skb, nested);

	ipset_nest_end(skb, adt);

	if (unlikely(id == first)) {

		cb->args[2] = 0;

		return -EMSGSIZE;

	}

	ipset_nest_end(skb, adt);

	return 0;

}

net/netfilter/ipset/ip_set_hash_gen.h

+1 −1
Original line number Diff line number Diff line
@@ -909,13 +909,13 @@ mtype_list(const struct ip_set *set, 


nla_put_failure:

	nlmsg_trim(skb, incomplete);

	ipset_nest_end(skb, atd);

	if (unlikely(first == cb->args[2])) {

		pr_warning("Can't list set %s: one bucket does not fit into "

			   "a message. Please report it!\n", set->name);

		cb->args[2] = 0;

		return -EMSGSIZE;

	}

	ipset_nest_end(skb, atd);

	return 0;

}

net/netfilter/ipset/ip_set_list_set.c

+1 −1
Original line number Diff line number Diff line
@@ -550,11 +550,11 @@ finish: 


nla_put_failure:

	nla_nest_cancel(skb, nested);

	ipset_nest_end(skb, atd);

	if (unlikely(i == first)) {

		cb->args[2] = 0;

		return -EMSGSIZE;

	}

	ipset_nest_end(skb, atd);

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE