From dbd7675dd3234fe1d7458470f749f51b670a73f0 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Tue, 17 Jun 2008 15:52:07 -0700
Subject: [PATCH] --- yaml --- r: 98233 b: refs/heads/master c:
 8a548868db62422113104ebc658065e3fe976951 h: refs/heads/master i:   98231:
 f1296febad01f991fed434ed957141fb2cae640e v: v3

---
 [refs]                                       | 2 +-
 trunk/net/netfilter/nf_conntrack_h323_main.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 22106dfede87..6cc57b79cdfd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68b80f11380889996aa7eadba29dbbb5c29a5864
+refs/heads/master: 8a548868db62422113104ebc658065e3fe976951
diff --git a/trunk/net/netfilter/nf_conntrack_h323_main.c b/trunk/net/netfilter/nf_conntrack_h323_main.c
index 95da1a24aab7..99e385d5b707 100644
--- a/trunk/net/netfilter/nf_conntrack_h323_main.c
+++ b/trunk/net/netfilter/nf_conntrack_h323_main.c
@@ -1799,6 +1799,7 @@ static int __init nf_conntrack_h323_init(void)
 err2:
 	nf_conntrack_helper_unregister(&nf_conntrack_helper_q931[0]);
 err1:
+	kfree(h323_buffer);
 	return ret;
 }