summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 918678f)
raw | patch | inline | side by side (parent: 918678f)
author | Pablo Neira Ayuso <pablo@netfilter.org> | |
Thu, 9 Jul 2015 20:56:00 +0000 (22:56 +0200) | ||
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
Thu, 22 Oct 2015 21:39:19 +0000 (14:39 -0700) |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/netfilter/nf_conntrack_netlink.c | patch | blob | history |
index b9f0e03743228ec852eee97eb6bb9ef1e0ab73e9..7d5dcd2a909237263406b076456e2db7a3906ff6 100644 (file)
}
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);