summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2008-06-19 15:05:45 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2008-06-21 22:24:56 -0700
commitb2e4b1cc4a1bfa05582949065a2c97ce7ab3caa3 (patch)
tree4608a4d4e2fb80ec73a3f9b62680852afd604c1a
parent3423e2b45ed2f50c5d419c3d93f349d04634477c (diff)
downloadlwn-b2e4b1cc4a1bfa05582949065a2c97ce7ab3caa3.tar.gz
lwn-b2e4b1cc4a1bfa05582949065a2c97ce7ab3caa3.zip
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>
-rw-r--r--net/netfilter/nf_conntrack_h323_main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c
index ea48f7184514..7407dd37b4e8 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;
}