d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check for obsolete NUL bin in CSCD descriptor.

Browse Source
This commit is contained in:
Alexander Motin 2015-09-12 20:45:09 +00:00
parent 051481a24e
commit 84e2fad15a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=287724
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/cam/ctl/ctl_tpc_local.c
View File

@ -282,7 +282,8 @@ tpcl_resolve(struct ctl_softc *softc, int init_port,
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;

1
sys/cam/scsi/scsi_all.h
View File

@ -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