From patchwork Tue Mar 21 06:57:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeffy Chen X-Patchwork-Id: 9636095 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BF1E4601E9 for ; Tue, 21 Mar 2017 06:57:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AE2A327CAF for ; Tue, 21 Mar 2017 06:57:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9EA3127CF3; Tue, 21 Mar 2017 06:57:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1DE3027CAF for ; Tue, 21 Mar 2017 06:57:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=z/aVvVz4mkblMsZNbPcw+P7b92bLXCihuOK1ICMtbKA=; b=Obk l0+taXQnvEOiVg53/NEMG9uerQThN2vhyzrO6J1mXJu1LtUh4S96n3tr7TYf5iDafYSoe/OgZ0QSI wnO7QcOoqriykrZ7ScbEI9gGuqZr3nejWxw3u8H293wEq5L/D1bgB1gZmDQ8+pExxRB5I0Z13jmZ4 my1VSUH95/rh4Gz4baXo7TWtYMJs2l7uVEYAiE4tCJp7b/MFAQCJmWgYqnwrGOJwOtlKXNr5LLnDi +ijBxM20bofz2jxdzKp9gu1ijGCLqUBjSnriz4U8I1GAVHCJc8bxA7aqlOGMMLvOBKtyB3ZhAx0T8 gK5U8o9ng7j8A/92lNYuvh4KcVoicVQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cqDji-0001b7-Kd; Tue, 21 Mar 2017 06:57:42 +0000 Received: from regular1.263xmail.com ([211.150.99.134]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cqDje-0001Yp-QZ for linux-arm-kernel@lists.infradead.org; Tue, 21 Mar 2017 06:57:40 +0000 Received: from jeffy.chen?rock-chips.com (unknown [192.168.165.103]) by regular1.263xmail.com (Postfix) with ESMTP id 789ED91D9 for ; Tue, 21 Mar 2017 14:57:13 +0800 (CST) X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 Received: from smtp.263.net (sg-smtp01.263.net [54.255.195.220]) by smtp.263.net (Postfix) with ESMTP id 1D501401; Tue, 21 Mar 2017 14:57:13 +0800 (CST) Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.263.net (Postfix) with ESMTP id 7E432DF302; Tue, 21 Mar 2017 14:57:14 +0800 (CST) X-RL-SENDER: jeffy.chen@rock-chips.com X-FST-TO: linux-arm-kernel@lists.infradead.org X-SENDER-IP: 103.29.142.67 X-LOGIN-NAME: jeffy.chen@rock-chips.com X-UNIQUE-TAG: X-ATTACHMENT-NUM: 0 X-SENDER: cjf@rock-chips.com X-DNS-TYPE: 0 Received: from localhost (unknown [103.29.142.67]) by smtp.263.net (Postfix) whith ESMTP id 9968FAG5ZT; Tue, 21 Mar 2017 14:57:15 +0800 (CST) From: Jeffy Chen To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] netfilter: nfnetlink_cthelper: Fix memory leak Date: Tue, 21 Mar 2017 14:57:05 +0800 Message-Id: <1490079425-6172-1-git-send-email-jeffy.chen@rock-chips.com> X-Mailer: git-send-email 2.1.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170320_235739_135390_574BE684 X-CRM114-Status: UNSURE ( 5.68 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jeffy Chen , Brian Norris , Douglas Anderson MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP We have memory leaks of nf_conntrack_helper & expect_policy. Signed-off-by: Jeffy Chen Reviewed-by: Dmitry Torokhov --- net/netfilter/nfnetlink_cthelper.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/net/netfilter/nfnetlink_cthelper.c b/net/netfilter/nfnetlink_cthelper.c index de87823..99d4bd7 100644 --- a/net/netfilter/nfnetlink_cthelper.c +++ b/net/netfilter/nfnetlink_cthelper.c @@ -191,6 +191,8 @@ nfnl_cthelper_parse_expect_policy(struct nf_conntrack_helper *helper, if (ret < 0) goto err; } + + kfree(helper->expect_policy); helper->expect_policy = expect_policy; return 0; err: @@ -249,6 +251,7 @@ nfnl_cthelper_create(const struct nlattr * const tb[], return 0; err: + kfree(helper->expect_policy); kfree(helper); return ret; } @@ -612,6 +615,8 @@ static int nfnl_cthelper_del(struct net *net, struct sock *nfnl, found = true; nf_conntrack_helper_unregister(cur); + kfree(cur->expect_policy); + kfree(cur); } } /* Make sure we return success if we flush and there is no helpers */ @@ -675,6 +680,8 @@ static void __exit nfnl_cthelper_exit(void) continue; nf_conntrack_helper_unregister(cur); + kfree(cur->expect_policy); + kfree(cur); } } }