Author: mav
Date: Wed Jan 11 07:45:29 2017
New Revision: 311920
URL: https://svnweb.freebsd.org/changeset/base/311920

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/11/sys/dev/isci/isci_task_request.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/isci/isci_task_request.c
==============================================================================
--- stable/11/sys/dev/isci/isci_task_request.c  Wed Jan 11 07:22:21 2017        
(r311919)
+++ stable/11/sys/dev/isci/isci_task_request.c  Wed Jan 11 07:45:29 2017        
(r311920)
@@ -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",
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to