netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Patrick McHardy <kaber@trash.net>
To: stable@kernel.org
Cc: Patrick McHardy <kaber@trash.net>,
	netfilter-devel@vger.kernel.org, davem@davemloft.net
Subject: netfilter 02/03: nf_conntrack_h323: fix memory leak in module initialization error path
Date: Thu, 19 Jun 2008 15:05:45 +0200 (MEST)	[thread overview]
Message-ID: <20080619130544.26204.28566.sendpatchset@localhost.localdomain> (raw)
In-Reply-To: <20080619130541.26204.54310.sendpatchset@localhost.localdomain>

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>

---
commit 54863b90bba4cc974df25c2e5ad207186727d9ec
tree 380077de74a3e20a6cdb2058e7c1390483898594
parent b59adf15982f7d435e1f6c5d8352d963a6c6a93a
author Patrick McHardy <kaber@trash.net> Thu, 19 Jun 2008 14:47:43 +0200
committer Patrick McHardy <kaber@trash.net> Thu, 19 Jun 2008 14:47:43 +0200

 net/netfilter/nf_conntrack_h323_main.c |    1 +
 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 898f192..6e58bc8 100644
--- a/net/netfilter/nf_conntrack_h323_main.c
+++ b/net/netfilter/nf_conntrack_h323_main.c
@@ -1792,6 +1792,7 @@ err3:
 err2:
 	nf_conntrack_helper_unregister(&nf_conntrack_helper_q931[0]);
 err1:
+	kfree(h323_buffer);
 	return ret;
 }
 

  parent reply	other threads:[~2008-06-19 13:05 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-19 13:05 netfilter 00/03: netfilter -stable fixes Patrick McHardy
2008-06-19 13:05 ` netfilter 01/03: nf_conntrack: fix ctnetlink related crash in nf_nat_setup_info() Patrick McHardy
2008-06-19 13:05 ` Patrick McHardy [this message]
2008-06-19 13:05 ` netfilter 03/03: nf_conntrack_h323: fix module unload crash Patrick McHardy
  -- strict thread matches above, loose matches on Subject: below --
2008-06-17 14:03 netfilter 00/03: netfilter fixes Patrick McHardy
2008-06-17 14:03 ` netfilter 02/03: nf_conntrack_h323: fix memory leak in module initialization error path Patrick McHardy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080619130544.26204.28566.sendpatchset@localhost.localdomain \
    --to=kaber@trash.net \
    --cc=davem@davemloft.net \
    --cc=netfilter-devel@vger.kernel.org \
    --cc=stable@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).