From owner-svn-src-head@freebsd.org  Sat Sep 12 20:45:11 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 21B11A03F4D;
 Sat, 12 Sep 2015 20:45:11 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 12FB8104A;
 Sat, 12 Sep 2015 20:45:11 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8CKjAGk040130;
 Sat, 12 Sep 2015 20:45:10 GMT (envelope-from mav@FreeBSD.org)
Received: (from mav@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8CKjA4K040128;
 Sat, 12 Sep 2015 20:45:10 GMT (envelope-from mav@FreeBSD.org)
Message-Id: <201509122045.t8CKjA4K040128@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org
 using -f
From: Alexander Motin <mav@FreeBSD.org>
Date: Sat, 12 Sep 2015 20:45:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r287724 - in head/sys/cam: ctl scsi
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Sep 2015 20:45:11 -0000

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