From: Patrick McHardy <kaber@trash.net>
Date: Thu, 19 Jun 2008 13:05:45 +0000 (+0200)
Subject: nf_conntrack_h323: fix memory leak in module initialization error path
X-Git-Tag: v2.6.25.8~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2e4b1cc4a1bfa05582949065a2c97ce7ab3caa3;p=thirdparty%2Fkernel%2Fstable.git

nf_conntrack_h323: fix memory leak in module initialization error path

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>
---

diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c
index ea48f71845145..7407dd37b4e82 100644
--- 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;
 }