From owner-svn-src-all@freebsd.org  Wed Jun  6 20:28:18 2018
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9F1A5FE1EE1;
 Wed,  6 Jun 2018 20:28:18 +0000 (UTC)
 (envelope-from tuexen@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 5251A861AB;
 Wed,  6 Jun 2018 20:28:18 +0000 (UTC)
 (envelope-from tuexen@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3502B7D4D;
 Wed,  6 Jun 2018 20:28:18 +0000 (UTC)
 (envelope-from tuexen@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w56KSIQ0021572;
 Wed, 6 Jun 2018 20:28:18 GMT (envelope-from tuexen@FreeBSD.org)
Received: (from tuexen@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w56KSISm021571;
 Wed, 6 Jun 2018 20:28:18 GMT (envelope-from tuexen@FreeBSD.org)
Message-Id: <201806062028.w56KSISm021571@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tuexen set sender to
 tuexen@FreeBSD.org using -f
From: Michael Tuexen <tuexen@FreeBSD.org>
Date: Wed, 6 Jun 2018 20:28:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r334734 - releng/11.2/sys/netinet
X-SVN-Group: releng
X-SVN-Commit-Author: tuexen
X-SVN-Commit-Paths: releng/11.2/sys/netinet
X-SVN-Commit-Revision: 334734
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.26
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Jun 2018 20:28:18 -0000

Author: tuexen
Date: Wed Jun  6 20:28:17 2018
New Revision: 334734
URL: https://svnweb.freebsd.org/changeset/base/334734

Log:
  MFstable/11 r334728:
  
  Ensure we are not dereferencing a NULL pointer.
  
  CID:		1385266
  Approved by: re (marius@)

Modified:
  releng/11.2/sys/netinet/sctp_indata.c
Directory Properties:
  releng/11.2/   (props changed)

Modified: releng/11.2/sys/netinet/sctp_indata.c
==============================================================================
--- releng/11.2/sys/netinet/sctp_indata.c	Wed Jun  6 20:09:21 2018	(r334733)
+++ releng/11.2/sys/netinet/sctp_indata.c	Wed Jun  6 20:28:17 2018	(r334734)
@@ -3619,7 +3619,9 @@ sctp_strike_gap_ack_chunks(struct sctp_tcb *stcb, stru
 						    SCTP_SO_NOT_LOCKED);
 					}
 					/* Make sure to flag we had a FR */
-					tp1->whoTo->net_ack++;
+					if (tp1->whoTo != NULL) {
+						tp1->whoTo->net_ack++;
+					}
 					continue;
 				}
 			}