Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24c509b2 authored by Florent Fourcot's avatar Florent Fourcot Committed by Jozsef Kadlecsik
Browse files

netfilter: ipset: remove useless memset() calls 



One of the memset call is buggy: it does not erase full array, but only pointer size.
Moreover, after a check, first step of nla_parse_nested/nla_parse is to
erase tb array as well. We can remove both calls safely.

Signed-off-by: default avatarFlorent Fourcot <florent.fourcot@wifirst.fr>
Signed-off-by: default avatarJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
parent 16e6427c

net/netfilter/ipset/ip_set_core.c

+0 −2
Original line number Diff line number Diff line
@@ -1599,7 +1599,6 @@ static int ip_set_uadd(struct net *net, struct sock *ctnl, struct sk_buff *skb, 
		int nla_rem;



		nla_for_each_nested(nla, attr[IPSET_ATTR_ADT], nla_rem) {

			memset(tb, 0, sizeof(tb));

			if (nla_type(nla) != IPSET_ATTR_DATA ||

			    !flag_nested(nla) ||

			    nla_parse_nested_deprecated(tb, IPSET_ATTR_ADT_MAX, nla, set->type->adt_policy, NULL))
@@ -1651,7 +1650,6 @@ static int ip_set_udel(struct net *net, struct sock *ctnl, struct sk_buff *skb, 
		int nla_rem;



		nla_for_each_nested(nla, attr[IPSET_ATTR_ADT], nla_rem) {

			memset(tb, 0, sizeof(*tb));

			if (nla_type(nla) != IPSET_ATTR_DATA ||

			    !flag_nested(nla) ||

			    nla_parse_nested_deprecated(tb, IPSET_ATTR_ADT_MAX, nla, set->type->adt_policy, NULL))