From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 01/14] netfilter: ipt_CLUSTERIP: put config struct if we can't increment ct refcount
Date: Fri, 2 Mar 2018 21:32:49 +0100 [thread overview]
Message-ID: <20180302203302.3724-2-pablo@netfilter.org> (raw)
In-Reply-To: <20180302203302.3724-1-pablo@netfilter.org>
From: Florian Westphal <fw@strlen.de>
This needs to put() the entry to avoid a resource leak in error path.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/ipv4/netfilter/ipt_CLUSTERIP.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
index 4b02ab39ebc5..4c8cfd352687 100644
--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
@@ -496,12 +496,15 @@ static int clusterip_tg_check(const struct xt_tgchk_param *par)
return PTR_ERR(config);
}
}
- cipinfo->config = config;
ret = nf_ct_netns_get(par->net, par->family);
- if (ret < 0)
+ if (ret < 0) {
pr_info("cannot load conntrack support for proto=%u\n",
par->family);
+ clusterip_config_entry_put(par->net, config);
+ clusterip_config_put(config);
+ return ret;
+ }
if (!par->net->xt.clusterip_deprecated_warning) {
pr_info("ipt_CLUSTERIP is deprecated and it will removed soon, "
@@ -509,6 +512,7 @@ static int clusterip_tg_check(const struct xt_tgchk_param *par)
par->net->xt.clusterip_deprecated_warning = true;
}
+ cipinfo->config = config;
return ret;
}
--
2.11.0
next prev parent reply other threads:[~2018-03-02 20:33 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-02 20:32 [PATCH 00/14] Netfilter/IPVS fixes for net Pablo Neira Ayuso
2018-03-02 20:32 ` Pablo Neira Ayuso [this message]
2018-03-02 20:32 ` [PATCH 02/14] netfilter: ipt_CLUSTERIP: put config instead of freeing it Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 03/14] netfilter: ipv6: fix use-after-free Write in nf_nat_ipv6_manip_pkt Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 04/14] netfilter: bridge: ebt_among: add missing match size checks Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 05/14] netfilter: ebtables: convert BUG_ONs to WARN_ONs Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 06/14] netfilter: ebtables: CONFIG_COMPAT: don't trust userland offsets Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 07/14] netfilter: nf_flow_table: fix checksum when handling DNAT Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 08/14] netfilter: increase IPSTATS_MIB_CSUMERRORS stat Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 09/14] netfilter: don't set F_IFACE on ipv6 fib lookups Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 10/14] netfilter: use skb_to_full_sk in ip6_route_me_harder Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 11/14] netfilter: nf_tables: return EBUSY if device already belongs to flowtable Pablo Neira Ayuso
2018-03-02 20:33 ` [PATCH 12/14] netfilter: nf_tables: missing attribute validation in nf_tables_delflowtable() Pablo Neira Ayuso
2018-03-02 20:33 ` [PATCH 13/14] netfilter: nf_tables: use the right index from flowtable error path Pablo Neira Ayuso
2018-03-02 20:33 ` [PATCH 14/14] ipvs: remove IPS_NAT_MASK check to fix passive FTP Pablo Neira Ayuso
2018-03-03 1:32 ` [PATCH 00/14] Netfilter/IPVS fixes for net David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180302203302.3724-2-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).