---

yaml --- r: 59046 b: refs/heads/master c: 99d24ed h: refs/heads/master v: v3
git-mirror · Jul 11, 2007 · b9bb10b · b9bb10b
1 parent 3dc9d0e
commit b9bb10b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56b3d975bbce65f655c5612b4822da671f9fd9b2
+refs/heads/master: 99d24edeb6abc6ca3a0d0fbdb83c664c04403c8c
diff --git a/trunk/net/netfilter/nf_conntrack_proto_sctp.c b/trunk/net/netfilter/nf_conntrack_proto_sctp.c
@@ -431,7 +431,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) {
 			pr_debug("nf_conntrack_sctp: invalid new deleting.\n");
 			return 0;
 		}