From patchwork Tue Mar 28 14:59:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liping Zhang X-Patchwork-Id: 744332 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vsvHJ5KjBz9rxl for ; Wed, 29 Mar 2017 02:01:32 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=163.com header.i=@163.com header.b="CCd8A5Tr"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754240AbdC1PBF (ORCPT ); Tue, 28 Mar 2017 11:01:05 -0400 Received: from m12-12.163.com ([220.181.12.12]:44731 "EHLO m12-12.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752655AbdC1PAr (ORCPT ); Tue, 28 Mar 2017 11:00:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=Qxa7hdlr2bZ2Dph4CE DGP6lVWQ3He4iL6qTE3iBGesw=; b=CCd8A5TrE5oXRRhaQKZkG95q9u6Go5CwIi AG/+AoaS5/Zg35ugqA6AK+MEhj0dJfBwkJqXTSblS578r+P9BxfyrjFtBlMoPurQ fqN6afFQdkE3C2AMa6F5TvGbMZ9tYTbHt2DHll4BUMOooGbHRvSch1+/o8DCWS/B mlN4Ds6gs= Received: from MiWiFi-R2D-srv.localdomain (unknown [101.93.124.222]) by smtp8 (Coremail) with SMTP id DMCowAAnNB1letpYUmeSBA--.4446S2; Tue, 28 Mar 2017 22:59:57 +0800 (CST) From: Liping Zhang To: pablo@netfilter.org Cc: netfilter-devel@vger.kernel.org, r.kubiak@samsung.com, Liping Zhang Subject: [PATCH nf] netfilter: nfnetlink_queue: fix secctx memory leak Date: Tue, 28 Mar 2017 22:59:25 +0800 Message-Id: <1490713165-60445-1-git-send-email-zlpnobody@163.com> X-Mailer: git-send-email 2.5.5 X-CM-TRANSID: DMCowAAnNB1letpYUmeSBA--.4446S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7AFy7CF1DKF4UGF45XrWDJwb_yoW8WryfpF yUJ34kAw1xXa1jkFW0yFW8ua4Svr4rGrZxGry3A3s3AFsxtr1Yqr4fKrWF9a1fCF4DGa1a qF4UKrs8Jrn8Xr7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jToGQUUUUU= X-Originating-IP: [101.93.124.222] X-CM-SenderInfo: x2os00perg5qqrwthudrp/xtbBUQ6ol1aDtdnukQAAsm Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From: Liping Zhang We must call security_release_secctx to free the memory returned by security_secid_to_secctx, otherwise memory may be leaked forever. Fixes: ef493bd930ae ("netfilter: nfnetlink_queue: add security context information") Signed-off-by: Liping Zhang --- net/netfilter/nfnetlink_queue.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c index 3ee0b8a..933509e 100644 --- a/net/netfilter/nfnetlink_queue.c +++ b/net/netfilter/nfnetlink_queue.c @@ -443,7 +443,7 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue, skb = alloc_skb(size, GFP_ATOMIC); if (!skb) { skb_tx_error(entskb); - return NULL; + goto nlmsg_failure; } nlh = nlmsg_put(skb, 0, 0, @@ -452,7 +452,7 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue, if (!nlh) { skb_tx_error(entskb); kfree_skb(skb); - return NULL; + goto nlmsg_failure; } nfmsg = nlmsg_data(nlh); nfmsg->nfgen_family = entry->state.pf; @@ -598,12 +598,17 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue, } nlh->nlmsg_len = skb->len; + if (seclen) + security_release_secctx(secdata, seclen); return skb; nla_put_failure: skb_tx_error(entskb); kfree_skb(skb); net_err_ratelimited("nf_queue: error creating packet message\n"); +nlmsg_failure: + if (seclen) + security_release_secctx(secdata, seclen); return NULL; }