From owner-svn-src-stable-10@freebsd.org  Wed Jan 11 07:46:02 2017
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id F0F24CAAE92;
 Wed, 11 Jan 2017 07:46:02 +0000 (UTC) (envelope-from mav@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 mx1.freebsd.org (Postfix) with ESMTPS id BD9871130;
 Wed, 11 Jan 2017 07:46:02 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0B7k1I5043845;
 Wed, 11 Jan 2017 07:46:01 GMT (envelope-from mav@FreeBSD.org)
Received: (from mav@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0B7k1hs043844;
 Wed, 11 Jan 2017 07:46:01 GMT (envelope-from mav@FreeBSD.org)
Message-Id: <201701110746.v0B7k1hs043844@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org
 using -f
From: Alexander Motin <mav@FreeBSD.org>
Date: Wed, 11 Jan 2017 07:46:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r311921 - stable/10/sys/dev/isci
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Jan 2017 07:46:03 -0000

Author: mav
Date: Wed Jan 11 07:46:01 2017
New Revision: 311921
URL: https://svnweb.freebsd.org/changeset/base/311921

Log:
  MFC r310703:
  Pass proper arguments (handles, not directly structure pointers) to
  scif_cb_domain_device_removed().
  
  This should fix NULL dereference on task management function timeout.

Modified:
  stable/10/sys/dev/isci/isci_task_request.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/isci/isci_task_request.c
==============================================================================
--- stable/10/sys/dev/isci/isci_task_request.c	Wed Jan 11 07:45:29 2017	(r311920)
+++ stable/10/sys/dev/isci/isci_task_request.c	Wed Jan 11 07:46:01 2017	(r311921)
@@ -210,8 +210,9 @@ isci_task_request_complete(SCI_CONTROLLE
 			retry_task = FALSE;
 			isci_log_message(0, "ISCI",
 			    "task timeout - not retrying\n");
-			scif_cb_domain_device_removed(isci_controller,
-			    isci_remote_device->domain, isci_remote_device);
+			scif_cb_domain_device_removed(scif_controller,
+			    isci_remote_device->domain->sci_object,
+			    remote_device);
 		} else {
 			retry_task = TRUE;
 			isci_log_message(0, "ISCI",