Commit 5250db63 authored by Kees Cook's avatar Kees Cook Committed by Martin K. Petersen
Browse files

scsi: isci: Use correctly sized target buffer for memcpy() 

In preparation for FORTIFY_SOURCE performing compile-time and run-time
field bounds checking for memcpy(), avoid intentionally writing across
neighboring array fields.

Switch from rsp_ui to resp_buf, since resp_ui isn't SSP_RESP_IU_MAX_SIZE
bytes in length. This avoids future compile-time warnings.

Link: https://lore.kernel.org/r/20210528181337.792268-4-keescook@chromium.org


Reviewed-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 66fc475b

drivers/scsi/isci/task.c

+2 −2
Original line number Diff line number Diff line
@@ -709,8 +709,8 @@ isci_task_request_complete(struct isci_host *ihost, 
		tmf->status = completion_status;



		if (tmf->proto == SAS_PROTOCOL_SSP) {

			memcpy(&tmf->resp.resp_iu,

			       &ireq->ssp.rsp,

			memcpy(tmf->resp.rsp_buf,

			       ireq->ssp.rsp_buf,

			       SSP_RESP_IU_MAX_SIZE);

		} else if (tmf->proto == SAS_PROTOCOL_SATA) {

			memcpy(&tmf->resp.d2h_fis,