summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorent Fourcot <florent.fourcot@wifirst.fr>2019-01-08 20:37:33 +0100
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2019-01-08 20:37:33 +0100
commit01a3f2e76d14868f88a23fca9a8bd024475ab976 (patch)
treea70e9a01e54c8e224adce3b159ee369d10e46f9e
parentac5292c2c57f626f7918a48126858140da239755 (diff)
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: Florent Fourcot <florent.fourcot@wifirst.fr> Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
-rw-r--r--kernel/net/netfilter/ipset/ip_set_core.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/net/netfilter/ipset/ip_set_core.c b/kernel/net/netfilter/ipset/ip_set_core.c
index b424c04..c6f81c2 100644
--- a/kernel/net/netfilter/ipset/ip_set_core.c
+++ b/kernel/net/netfilter/ipset/ip_set_core.c
@@ -1621,7 +1621,6 @@ IPSET_CBFN(ip_set_uadd, struct net *net, struct sock *ctnl,
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(tb, IPSET_ATTR_ADT_MAX, nla,
@@ -1677,7 +1676,6 @@ IPSET_CBFN(ip_set_udel, struct net *net, struct sock *ctnl,
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(tb, IPSET_ATTR_ADT_MAX, nla,