lkml.org 
[lkml]   [2012]   [Dec]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] netfilter: Don't leak 'exp' in ctnetlink_create_expect()
    'if ((!help) && (!cda[CTA_EXPECT_TIMEOUT]))' then we should remember
    to free 'exp' that was allocated by 'nf_ct_expect_alloc()' by jumping
    to the 'err_out' label rather than the 'out' label in
    ctnetlink_create_expect().
    This patch should get rid of the leak.

    Signed-off-by: Jesper Juhl <jj@chaosbits.net>
    ---
    net/netfilter/nf_conntrack_netlink.c | 2 +-
    1 files changed, 1 insertions(+), 1 deletions(-)

    note: compile tested only.

    diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
    index 4e078cd..627b0e5 100644
    --- a/net/netfilter/nf_conntrack_netlink.c
    +++ b/net/netfilter/nf_conntrack_netlink.c
    @@ -2624,7 +2624,7 @@ ctnetlink_create_expect(struct net *net, u16 zone,
    if (!help) {
    if (!cda[CTA_EXPECT_TIMEOUT]) {
    err = -EINVAL;
    - goto out;
    + goto err_out;
    }
    exp->timeout.expires =
    jiffies + ntohl(nla_get_be32(cda[CTA_EXPECT_TIMEOUT])) * HZ;
    --
    1.7.1

    --
    Jesper Juhl <jj@chaosbits.net> http://www.chaosbits.net/
    Don't top-post http://www.catb.org/jargon/html/T/top-post.html
    Plain text mails only, please.



    \
     
     \ /
      Last update: 2012-12-26 23:21    [W:6.686 / U:0.508 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site