| From | Jiri Slaby <> | Subject | [PATCH 3.12 052/123] netfilter: ctnetlink: put back references to master ct and expect objects | Date | Wed, 28 Oct 2015 14:52:43 +0100 |
| |
From: Pablo Neira Ayuso <pablo@netfilter.org>
3.12-stable review patch. If anyone has any objections, please let me know.
===============
commit 95dd8653de658143770cb0e55a58d2aab97c79d2 upstream.
We have to put back the references to the master conntrack and the expectation that we just created, otherwise we'll leak them.
Fixes: 0ef71ee1a5b9 ("netfilter: ctnetlink: refactor ctnetlink_create_expect") Reported-by: Tim Wiess <Tim.Wiess@watchguard.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: Jiri Slaby <jslaby@suse.cz> --- net/netfilter/nf_conntrack_netlink.c | 5 ----- 1 file changed, 5 deletions(-)
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index eea936b70d15..db744dd68707 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c @@ -2925,11 +2925,6 @@ ctnetlink_create_expect(struct net *net, u16 zone, } err = nf_ct_expect_related_report(exp, portid, report); - if (err < 0) - goto err_exp; - - return 0; -err_exp: nf_ct_expect_put(exp); err_ct: nf_ct_put(ct); -- 2.6.2
|