diff options
author | Phil Sutter <phil@nwl.cc> | 2019-01-22 11:14:21 +0100 |
---|---|---|
committer | Florian Westphal <fw@strlen.de> | 2019-02-01 15:49:29 +0100 |
commit | 432a5ecfa7890bd3495bb1ab5e34c2258090133f (patch) | |
tree | 7ff1c924a4a1e30ca0d5cc3f843c9a3975250ad4 /iptables/nft-arp.c | |
parent | 32ebc39f71e8107d6069a9f6fba8338a2823889d (diff) |
nft: Fix potential memleaks in nft_*_rule_find()
These functions parse an nftnl_rule into a local instance of
iptables_command_state which potentially allocates memory (for matches
or target), so call ops->clear_cs() before returning to caller.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'iptables/nft-arp.c')
-rw-r--r-- | iptables/nft-arp.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/iptables/nft-arp.c b/iptables/nft-arp.c index 438646de..637da427 100644 --- a/iptables/nft-arp.c +++ b/iptables/nft-arp.c @@ -659,20 +659,24 @@ static bool nft_arp_rule_find(struct nft_family_ops *ops, struct nftnl_rule *r, { const struct iptables_command_state *cs = data; struct iptables_command_state this = {}; + bool ret = false; /* Delete by matching rule case */ nft_rule_to_iptables_command_state(r, &this); if (!nft_arp_is_same(&cs->arp, &this.arp)) - return false; + goto out; if (!compare_targets(cs->target, this.target)) - return false; + goto out; if (this.jumpto && strcmp(cs->jumpto, this.jumpto) != 0) - return false; + goto out; - return true; + ret = true; +out: + ops->clear_cs(&this); + return ret; } static void nft_arp_save_chain(const struct nftnl_chain *c, const char *policy) |