Commit ba69ead9 authored by Martin Wilck's avatar Martin Wilck Committed by Martin K. Petersen

scsi: scsi_devinfo: handle non-terminated strings

devinfo->vendor and devinfo->model aren't necessarily
zero-terminated.

Fixes: b8018b97 "scsi_devinfo: fixup string compare"
Signed-off-by: default avatarMartin Wilck <mwilck@suse.com>
Reviewed-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 45349821
...@@ -458,7 +458,8 @@ static struct scsi_dev_info_list *scsi_dev_info_list_find(const char *vendor, ...@@ -458,7 +458,8 @@ static struct scsi_dev_info_list *scsi_dev_info_list_find(const char *vendor,
/* /*
* vendor strings must be an exact match * vendor strings must be an exact match
*/ */
if (vmax != strlen(devinfo->vendor) || if (vmax != strnlen(devinfo->vendor,
sizeof(devinfo->vendor)) ||
memcmp(devinfo->vendor, vskip, vmax)) memcmp(devinfo->vendor, vskip, vmax))
continue; continue;
...@@ -466,7 +467,7 @@ static struct scsi_dev_info_list *scsi_dev_info_list_find(const char *vendor, ...@@ -466,7 +467,7 @@ static struct scsi_dev_info_list *scsi_dev_info_list_find(const char *vendor,
* @model specifies the full string, and * @model specifies the full string, and
* must be larger or equal to devinfo->model * must be larger or equal to devinfo->model
*/ */
mlen = strlen(devinfo->model); mlen = strnlen(devinfo->model, sizeof(devinfo->model));
if (mmax < mlen || memcmp(devinfo->model, mskip, mlen)) if (mmax < mlen || memcmp(devinfo->model, mskip, mlen))
continue; continue;
return devinfo; return devinfo;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment