Date: Wed, 11 Jan 2017 07:46:01 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> 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 Message-ID: <201701110746.v0B7k1hs043844@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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",
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701110746.v0B7k1hs043844>