Date: Mon, 5 Oct 2015 09:08:07 +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: r288744 - in stable/10/sys/cam: ctl scsi Message-ID: <201510050908.t959877l023761@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Mon Oct 5 09:08:06 2015 New Revision: 288744 URL: https://svnweb.freebsd.org/changeset/base/288744 Log: MFC r287724: Check for obsolete NUL bin in CSCD descriptor. Modified: stable/10/sys/cam/ctl/ctl_tpc_local.c stable/10/sys/cam/scsi/scsi_all.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/cam/ctl/ctl_tpc_local.c ============================================================================== --- stable/10/sys/cam/ctl/ctl_tpc_local.c Mon Oct 5 09:07:15 2015 (r288743) +++ stable/10/sys/cam/ctl/ctl_tpc_local.c Mon Oct 5 09:08:06 2015 (r288744) @@ -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: stable/10/sys/cam/scsi/scsi_all.h ============================================================================== --- stable/10/sys/cam/scsi/scsi_all.h Mon Oct 5 09:07:15 2015 (r288743) +++ stable/10/sys/cam/scsi/scsi_all.h Mon Oct 5 09:08:06 2015 (r288744) @@ -1669,6 +1669,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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510050908.t959877l023761>