[conntrack-tools] conntrackd: fix crash for unubuffered channel on exit path

Pablo Neira netfilter-cvslog-bounces at lists.netfilter.org
Fri Aug 14 16:34:15 CEST 2009


Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=conntrack-tools.git;a=commit;h=2c5bed23c8afdd7f349d861fb7e7c8ba33ae3fe1
commit 2c5bed23c8afdd7f349d861fb7e7c8ba33ae3fe1
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Fri Aug 14 16:33:42 2009 +0200
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Fri Aug 14 16:33:42 2009 +0200

    conntrackd: fix crash for unubuffered channel on exit path
    
    This patch fixes a crash in the exit path for channels that
    are not buffered (no CHANNEL_F_BUFFERED flag set). This fix
    does not affect any existing channel in the tree.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
       via  2c5bed23c8afdd7f349d861fb7e7c8ba33ae3fe1 (commit)
      from  817f847b52bb05c924491deb994194fd5c1c3ba2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2c5bed23c8afdd7f349d861fb7e7c8ba33ae3fe1
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Fri Aug 14 16:33:42 2009 +0200

    conntrackd: fix crash for unubuffered channel on exit path
    
    This patch fixes a crash in the exit path for channels that
    are not buffered (no CHANNEL_F_BUFFERED flag set). This fix
    does not affect any existing channel in the tree.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

-----------------------------------------------------------------------

 src/channel.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
This patch fixes a crash in the exit path for channels that
are not buffered (no CHANNEL_F_BUFFERED flag set). This fix
does not affect any existing channel in the tree.

Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

diff --git a/src/channel.c b/src/channel.c
index 255026a..9d74b7f 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -57,6 +57,9 @@ channel_buffer_open(int mtu)
 static void
 channel_buffer_close(struct channel_buffer *b)
 {
+	if (b == NULL)
+		return;
+
 	free(b->data);
 	free(b);
 }



More information about the netfilter-cvslog mailing list