Commit c3408c4a authored by Kees Cook's avatar Kees Cook
Browse files

scsi: qla2xxx: Avoid possible run-time warning with long model_num 



The prior strlcpy() replacement of strncpy() here (which was
later replaced with strscpy()) expected pinfo->model_num (and
pinfo->model_description) to be NUL-terminated, but it is possible
it was not, as the code pattern here shows vha->hw->model_number (and
vha->hw->model_desc) being exactly 1 character larger, and the replaced
strncpy() was copying only up to the size of the source character
array. Replace this with memtostr(), which is the unambiguous way to
convert a maybe not-NUL-terminated character array into a NUL-terminated
string.

Fixes: 527e9b70 ("scsi: qla2xxx: Use memcpy() and strlcpy() instead of strcpy() and strncpy()")
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20240410023155.2100422-5-keescook@chromium.org


Signed-off-by: default avatarKees Cook <keescook@chromium.org>
parent d4309246

drivers/scsi/qla2xxx/qla_mr.c

+2 −4
Original line number Diff line number Diff line
@@ -1909,10 +1909,8 @@ qlafx00_fx_disc(scsi_qla_host_t *vha, fc_port_t *fcport, uint16_t fx_type) 
	if (fx_type == FXDISC_GET_CONFIG_INFO) {

		struct config_info_data *pinfo =

		    (struct config_info_data *) fdisc->u.fxiocb.rsp_addr;

		strscpy(vha->hw->model_number, pinfo->model_num,

			ARRAY_SIZE(vha->hw->model_number));

		strscpy(vha->hw->model_desc, pinfo->model_description,

			ARRAY_SIZE(vha->hw->model_desc));

		memtostr(vha->hw->model_number, pinfo->model_num);

		memtostr(vha->hw->model_desc, pinfo->model_description);

		memcpy(&vha->hw->mr.symbolic_name, pinfo->symbolic_name,

		    sizeof(vha->hw->mr.symbolic_name));

		memcpy(&vha->hw->mr.serial_num, pinfo->serial_num,