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

When comparing device IDs, make sure that they have the same type

Browse Source 
(like NAA assigned) and identify the same entity (like device or port).
Otherwise there can be false positives since at least some models of
Seagate disks use same IDs for the whole device and one of its ports.

MFC after:	2 weeks
This commit is contained in:
Alexander Motin 2013-12-08 20:43:01 +00:00
parent 703b304f33
commit c689c6239e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/cam/scsi/scsi_all.c
View File

@ -6509,7 +6509,11 @@ scsi_devid_match(uint8_t *lhs, size_t lhs_len, uint8_t *rhs, size_t rhs_len)
while (rhs_id <= rhs_last
&& (rhs_id->identifier + rhs_id->length) <= rhs_end) {
if (rhs_id->length == lhs_id->length
if ((rhs_id->id_type &
(SVPD_ID_ASSOC_MASK | SVPD_ID_TYPE_MASK)) ==
(lhs_id->id_type &
(SVPD_ID_ASSOC_MASK | SVPD_ID_TYPE_MASK))
&& rhs_id->length == lhs_id->length
&& memcmp(rhs_id->identifier, lhs_id->identifier,
rhs_id->length) == 0)
return (0);