---

yaml --- r: 65171 b: refs/heads/master c: 3c77f96 h: refs/heads/master i: 65169: cf5e604 65167: 81e49bf v: v3
git-mirror · Sep 26, 2007 · ff35b66 · ff35b66
1 parent 6a35314
commit ff35b66
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ece25dfa0991f65c4e1d26beb1c3c45bda4239b8
+refs/heads/master: 3c77f961b55b6060858c68a213d7f4470d7f3eb2
diff --git a/trunk/net/sctp/input.c b/trunk/net/sctp/input.c
@@ -622,6 +622,14 @@ static int sctp_rcv_ootb(struct sk_buff *skb)
 		if (SCTP_CID_SHUTDOWN_COMPLETE == ch->type)
 			goto discard;
 
+		/* RFC 4460, 2.11.2
+		 * This will discard packets with INIT chunk bundled as
+		 * subsequent chunks in the packet.  When INIT is first,
+		 * the normal INIT processing will discard the chunk.
+		 */
+		if (SCTP_CID_INIT == ch->type && (void *)ch != skb->data)
+			goto discard;
+
 		/* RFC 8.4, 7) If the packet contains a "Stale cookie" ERROR
 		 * or a COOKIE ACK the SCTP Packet should be silently
 		 * discarded.