svn commit: r310703 - head/sys/dev/isci

Alexander Motin mav at FreeBSD.org
Wed Dec 28 14:50:40 UTC 2016


Author: mav
Date: Wed Dec 28 14:50:39 2016
New Revision: 310703
URL: https://svnweb.freebsd.org/changeset/base/310703

Log:
  Pass proper arguments (handles, not directly structure pointers) to
  scif_cb_domain_device_removed().
  
  This should fix NULL dereference on task management function timeout.
  
  Reviewed by:	jimharris
  MFC after:	2 weeks

Modified:
  head/sys/dev/isci/isci_task_request.c

Modified: head/sys/dev/isci/isci_task_request.c
==============================================================================
--- head/sys/dev/isci/isci_task_request.c	Wed Dec 28 14:25:04 2016	(r310702)
+++ head/sys/dev/isci/isci_task_request.c	Wed Dec 28 14:50:39 2016	(r310703)
@@ -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",


More information about the svn-src-head mailing list