svn commit: r252977 - stable/9/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Sun Jul  7 17:06:33 2013
New Revision: 252977
URL: http://svnweb.freebsd.org/changeset/base/252977

Log:
  MFC r252718:
  When processing an incoming ABORT, SHUTDOWN_COMPLETE or ERROR (NAT related)
  chunk, take always the T-bit into account, when checking the verification
  tag.

Modified:
  stable/9/sys/netinet/sctp_input.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/netinet/sctp_input.c
==============================================================================
--- stable/9/sys/netinet/sctp_input.c	Sun Jul  7 17:04:23 2013	(r252976)
+++ stable/9/sys/netinet/sctp_input.c	Sun Jul  7 17:06:33 2013	(r252977)
@@ -4568,8 +4568,10 @@ __attribute__((noinline))
 		if ((ch->chunk_type == SCTP_ABORT_ASSOCIATION) ||
 		    (ch->chunk_type == SCTP_SHUTDOWN_COMPLETE) ||
 		    (ch->chunk_type == SCTP_PACKET_DROPPED)) {
-			if ((vtag_in == asoc->my_vtag) ||
-			    ((ch->chunk_flags & SCTP_HAD_NO_TCB) &&
+			/* Take the T-bit always into account. */
+			if ((((ch->chunk_flags & SCTP_HAD_NO_TCB) == 0) &&
+			    (vtag_in == asoc->my_vtag)) ||
+			    (((ch->chunk_flags & SCTP_HAD_NO_TCB) == SCTP_HAD_NO_TCB) &&
 			    (vtag_in == asoc->peer_vtag))) {
 				/* this is valid */
 			} else {