summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2015-07-09 22:56:00 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2015-07-10 14:18:03 +0200
commit95dd8653de658143770cb0e55a58d2aab97c79d2 (patch)
treebd35f32ca3caa825a0623bb6516d0e2e333b5223 /net
parenta7d35f9d73e9ffa74a02304b817e579eec632f67 (diff)
downloadblackbird-op-linux-95dd8653de658143770cb0e55a58d2aab97c79d2.tar.gz
blackbird-op-linux-95dd8653de658143770cb0e55a58d2aab97c79d2.zip
netfilter: ctnetlink: put back references to master ct and expect objects
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>
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/nf_conntrack_netlink.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index d1c23940a86a..6b8b0abbfab4 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -2995,11 +2995,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);
OpenPOWER on IntegriCloud