Linux 2.6.25.8

[thirdparty/kernel/stable-queue.git] / releases / 2.6.25.8 / nf_conntrack_h323-fix-memory-leak-in-module-initialization-error-path.patch

From stable-bounces@linux.kernel.org Thu Jun 19 06:06:18 2008
From: Patrick McHardy <kaber@trash.net>
Date: Thu, 19 Jun 2008 15:05:45 +0200 (MEST)
Subject: nf_conntrack_h323: fix memory leak in module initialization error path
To: stable@kernel.org
Cc: netfilter-devel@vger.kernel.org, Patrick McHardy <kaber@trash.net>, davem@davemloft.net
Message-ID: <20080619130544.26204.28566.sendpatchset@localhost.localdomain>

From: Patrick McHardy <kaber@trash.net>

netfilter: nf_conntrack_h323: fix memory leak in module initialization error path

Upstream commit 8a548868db62422113104ebc658065e3fe976951

Properly free h323_buffer when helper registration fails.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 net/netfilter/nf_conntrack_h323_main.c |    1 +
 1 file changed, 1 insertion(+)

--- a/net/netfilter/nf_conntrack_h323_main.c
+++ b/net/netfilter/nf_conntrack_h323_main.c
@@ -1799,6 +1799,7 @@ err3:
 err2:
 	nf_conntrack_helper_unregister(&nf_conntrack_helper_h245);
 err1:
+	kfree(h323_buffer);
 	return ret;
 }