svn commit: r303025 - head/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Tue Jul 19 11:16:44 2016
New Revision: 303025
URL: https://svnweb.freebsd.org/changeset/base/303025

Log:
  Use correct order of conditions to avoid NULL deref.
  
  MFC after:	3 days
  X-MFC with:	r302935

Modified:
  head/sys/netinet/sctp_indata.c

Modified: head/sys/netinet/sctp_indata.c
==============================================================================
--- head/sys/netinet/sctp_indata.c	Tue Jul 19 09:48:08 2016	(r303024)
+++ head/sys/netinet/sctp_indata.c	Tue Jul 19 11:16:44 2016	(r303025)
@@ -831,7 +831,7 @@ restart:
 					    SCTP_READ_LOCK_NOT_HELD, SCTP_SO_NOT_LOCKED);
 				}
 				sctp_wakeup_the_read_socket(stcb->sctp_ep, stcb, SCTP_SO_NOT_LOCKED);
-				if (!TAILQ_EMPTY(&nc->reasm) && (nc->first_frag_seen)) {
+				if ((nc->first_frag_seen) && !TAILQ_EMPTY(&nc->reasm)) {
 					/*
 					 * Switch to the new guy and
 					 * continue