netfilter: ipset: Don't call ip_nest_end needlessly in the error path
Suggested-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
This commit is contained in:
Родитель
7722e0d1c0
Коммит
122ebbf24c
|
@ -228,11 +228,11 @@ mtype_list(const struct ip_set *set,
|
||||||
|
|
||||||
nla_put_failure:
|
nla_put_failure:
|
||||||
nla_nest_cancel(skb, nested);
|
nla_nest_cancel(skb, nested);
|
||||||
ipset_nest_end(skb, adt);
|
|
||||||
if (unlikely(id == first)) {
|
if (unlikely(id == first)) {
|
||||||
cb->args[2] = 0;
|
cb->args[2] = 0;
|
||||||
return -EMSGSIZE;
|
return -EMSGSIZE;
|
||||||
}
|
}
|
||||||
|
ipset_nest_end(skb, adt);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -909,13 +909,13 @@ mtype_list(const struct ip_set *set,
|
||||||
|
|
||||||
nla_put_failure:
|
nla_put_failure:
|
||||||
nlmsg_trim(skb, incomplete);
|
nlmsg_trim(skb, incomplete);
|
||||||
ipset_nest_end(skb, atd);
|
|
||||||
if (unlikely(first == cb->args[2])) {
|
if (unlikely(first == cb->args[2])) {
|
||||||
pr_warning("Can't list set %s: one bucket does not fit into "
|
pr_warning("Can't list set %s: one bucket does not fit into "
|
||||||
"a message. Please report it!\n", set->name);
|
"a message. Please report it!\n", set->name);
|
||||||
cb->args[2] = 0;
|
cb->args[2] = 0;
|
||||||
return -EMSGSIZE;
|
return -EMSGSIZE;
|
||||||
}
|
}
|
||||||
|
ipset_nest_end(skb, atd);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -550,11 +550,11 @@ finish:
|
||||||
|
|
||||||
nla_put_failure:
|
nla_put_failure:
|
||||||
nla_nest_cancel(skb, nested);
|
nla_nest_cancel(skb, nested);
|
||||||
ipset_nest_end(skb, atd);
|
|
||||||
if (unlikely(i == first)) {
|
if (unlikely(i == first)) {
|
||||||
cb->args[2] = 0;
|
cb->args[2] = 0;
|
||||||
return -EMSGSIZE;
|
return -EMSGSIZE;
|
||||||
}
|
}
|
||||||
|
ipset_nest_end(skb, atd);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче