svn commit: r309273 - stable/11/sys/cam/scsi

[Alan Somers]

Author: asomers
Date: Mon Nov 28 22:35:10 2016
New Revision: 309273
URL: https://svnweb.freebsd.org/changeset/base/309273

Log:
  MFC r308780
  
  Fix "camcontrol rescan" with SATA drives behind a SAS controller
  
  A bug in CAM's serial number hash logic resulted in SATA drives behind a SAS
  controller getting removed and readded anytime the drive was rescanned for
  any reason

Modified:
  stable/11/sys/cam/scsi/scsi_xpt.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/cam/scsi/scsi_xpt.c
==============================================================================
--- stable/11/sys/cam/scsi/scsi_xpt.c	Mon Nov 28 22:19:41 2016	(r309272)
+++ stable/11/sys/cam/scsi/scsi_xpt.c	Mon Nov 28 22:35:10 2016	(r309273)
@@ -1600,8 +1600,8 @@ probe_device_check:
 				  sizeof(struct scsi_inquiry_data));
 
 			if (have_serialnum)
-				MD5Update(&context, serial_buf->serial_num,
-					  serial_buf->length);
+				MD5Update(&context, path->device->serial_num,
+					  path->device->serial_num_len);
 
 			MD5Final(digest, &context);
 			if (bcmp(softc->digest, digest, 16) == 0)