svn commit: r287724 - in head/sys/cam: ctl scsi

[Alexander Motin]

Author: mav
Date: Sat Sep 12 20:45:09 2015
New Revision: 287724
URL: https://svnweb.freebsd.org/changeset/base/287724

Log:
  Check for obsolete NUL bin in CSCD descriptor.

Modified:
  head/sys/cam/ctl/ctl_tpc_local.c
  head/sys/cam/scsi/scsi_all.h

Modified: head/sys/cam/ctl/ctl_tpc_local.c
==============================================================================
--- head/sys/cam/ctl/ctl_tpc_local.c	Sat Sep 12 20:36:39 2015	(r287723)
+++ head/sys/cam/ctl/ctl_tpc_local.c	Sat Sep 12 20:45:09 2015	(r287724)
@@ -282,7 +282,8 @@ tpcl_resolve(struct ctl_softc *softc, in
 	uint64_t lunid = UINT64_MAX;
 
 	if (cscd->type_code != EC_CSCD_ID ||
-	    (cscd->luidt_pdt & EC_LUIDT_MASK) != EC_LUIDT_LUN)
+	    (cscd->luidt_pdt & EC_LUIDT_MASK) != EC_LUIDT_LUN ||
+	    (cscd->luidt_pdt & EC_NUL) != 0)
 		return (lunid);
 
 	cscdid = (struct scsi_ec_cscd_id *)cscd;

Modified: head/sys/cam/scsi/scsi_all.h
==============================================================================
--- head/sys/cam/scsi/scsi_all.h	Sat Sep 12 20:36:39 2015	(r287723)
+++ head/sys/cam/scsi/scsi_all.h	Sat Sep 12 20:45:09 2015	(r287724)
@@ -1666,6 +1666,7 @@ struct scsi_ec_cscd
 	uint8_t  type_code;
 #define EC_CSCD_EXT		0xff
 	uint8_t  luidt_pdt;
+#define EC_NUL			0x20
 #define EC_LUIDT_MASK		0xc0
 #define EC_LUIDT_LUN		0x00
 #define EC_LUIDT_PROXY_TOKEN	0x40