lkml.org 
[lkml]   [2015]   [Sep]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 025/130] netfilter: ctnetlink: put back references to master ct and expect objects
    Date
    3.16.7-ckt17 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Pablo Neira Ayuso <pablo@netfilter.org>

    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: Luis Henriques <luis.henriques@canonical.com>
    ---
    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 300ed1eec729..3f96dbd25389 100644
    --- a/net/netfilter/nf_conntrack_netlink.c
    +++ b/net/netfilter/nf_conntrack_netlink.c
    @@ -2957,11 +2957,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);

    \
     
     \ /
      Last update: 2015-09-04 16:21    [W:4.249 / U:0.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site