public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: linux-kernel@vger.kernel.org,
	Andrew Morton <akpm@linux-foundation.org>,
	torvalds@linux-foundation.org, stable@kernel.org
Subject: Re: Linux 2.6.22.1
Date: Tue, 10 Jul 2007 13:06:53 -0700	[thread overview]
Message-ID: <20070710200653.GB5881@kroah.com> (raw)
In-Reply-To: <20070710200637.GA5881@kroah.com>

diff --git a/Makefile b/Makefile
index de4f8f7..e28395a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 22
-EXTRAVERSION =
+EXTRAVERSION = .1
 NAME = Holy Dancing Manatees, Batman!
 
 # *DOCUMENTATION*
diff --git a/net/netfilter/nf_conntrack_proto_sctp.c b/net/netfilter/nf_conntrack_proto_sctp.c
index 0d3254b..6e41ba5 100644
--- a/net/netfilter/nf_conntrack_proto_sctp.c
+++ b/net/netfilter/nf_conntrack_proto_sctp.c
@@ -460,7 +460,8 @@ static int sctp_new(struct nf_conn *conntrack, const struct sk_buff *skb,
 					 SCTP_CONNTRACK_NONE, sch->type);
 
 		/* Invalid: delete conntrack */
-		if (newconntrack == SCTP_CONNTRACK_MAX) {
+		if (newconntrack == SCTP_CONNTRACK_NONE ||
+		    newconntrack == SCTP_CONNTRACK_MAX) {
 			DEBUGP("nf_conntrack_sctp: invalid new deleting.\n");
 			return 0;
 		}

  reply	other threads:[~2007-07-10 20:07 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-07-10 20:06 Linux 2.6.22.1 Greg KH
2007-07-10 20:06 ` Greg KH [this message]
2007-07-12 18:35 ` Nish Aravamudan
2007-07-12 18:41   ` [stable] " Greg KH
2007-07-12 18:46     ` Nish Aravamudan
2007-07-12 18:52       ` Chris Wright
2007-07-12 19:08         ` Nish Aravamudan
2007-07-12 23:02         ` Domenico Andreoli
2007-07-12 23:03         ` Rene Herman
2007-07-13  6:16   ` Bryan Wu
2007-07-13  6:16     ` Greg KH
2007-07-13  6:28       ` Bryan Wu
2007-07-13  6:34         ` Linus Torvalds
2007-07-13  6:51           ` Chris Wright
2007-07-13  6:58             ` Bryan Wu
2007-07-13  6:47       ` Adrian Bunk
2007-07-13 19:52         ` Greg KH
2007-07-14  0:44         ` H. Peter Anvin

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=20070710200653.GB5881@kroah.com \
    --to=greg@kroah.com \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@kernel.org \
    --cc=torvalds@linux-foundation.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