svn commit: r294176 - stable/10/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Sat Jan 16 18:00:47 2016
New Revision: 294176
URL: https://svnweb.freebsd.org/changeset/base/294176

Log:
  MFC r290023:
  When processing a cookie, any mismatch in port numbers or the vtag results
  in failing the check.
  This fixes https://github.com/nplab/ETSI-SCTP-Conformance-Testsuite/blob/master/sctp-imh-tests/sctp-imh-i-3-3.pkt

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

Modified: stable/10/sys/netinet/sctp_input.c
==============================================================================
--- stable/10/sys/netinet/sctp_input.c	Sat Jan 16 17:57:54 2016	(r294175)
+++ stable/10/sys/netinet/sctp_input.c	Sat Jan 16 18:00:47 2016	(r294176)
@@ -2435,8 +2435,8 @@ sctp_handle_cookie_echo(struct mbuf *m, 
 	cookie_offset = offset + sizeof(struct sctp_chunkhdr);
 	cookie_len = ntohs(cp->ch.chunk_length);
 
-	if ((cookie->peerport != sh->src_port) &&
-	    (cookie->myport != sh->dest_port) &&
+	if ((cookie->peerport != sh->src_port) ||
+	    (cookie->myport != sh->dest_port) ||
 	    (cookie->my_vtag != sh->v_tag)) {
 		/*
 		 * invalid ports or bad tag.  Note that we always leave the