From patchwork Wed Dec 26 21:49:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesper Juhl X-Patchwork-Id: 208218 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 3F1982C00BE for ; Thu, 27 Dec 2012 08:49:53 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751005Ab2LZVto (ORCPT ); Wed, 26 Dec 2012 16:49:44 -0500 Received: from swampdragon.chaosbits.net ([90.184.90.115]:49155 "EHLO swampdragon.chaosbits.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750918Ab2LZVtn (ORCPT ); Wed, 26 Dec 2012 16:49:43 -0500 Received: by swampdragon.chaosbits.net (Postfix, from userid 1000) id 6BEA39403F; Wed, 26 Dec 2012 22:49:41 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by swampdragon.chaosbits.net (Postfix) with ESMTP id 64E8F9403D; Wed, 26 Dec 2012 22:49:41 +0100 (CET) Date: Wed, 26 Dec 2012 22:49:40 +0100 (CET) From: Jesper Juhl To: netfilter@vger.kernel.org cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, coreteam@netfilter.org, netfilter-devel@vger.kernel.org, "David S. Miller" , Patrick McHardy , Pablo Neira Ayuso , Jay Schulist , Harald Welte Subject: [PATCH] netfilter: Don't leak 'exp' in ctnetlink_create_expect() Message-ID: User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org '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 --- 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;