* [PATCH] scsi: ips: Avoid over-read of sense buffer
@ 2021-06-16 21:24 Kees Cook
2021-06-19 3:29 ` Martin K. Petersen
0 siblings, 1 reply; 2+ messages in thread
From: Kees Cook @ 2021-06-16 21:24 UTC (permalink / raw)
To: Martin K. Petersen
Cc: Kees Cook, Adaptec OEM Raid Solutions, James E.J. Bottomley,
linux-kernel, linux-scsi, linux-hardening
In preparation for FORTIFY_SOURCE performing compile-time and run-time
field bounds checking for memcpy() avoid intentionally reading across
neighboring array fields.
scb->scsi_cmd->sense_buffer is 96 bytes:
#define SCSI_SENSE_BUFFERSIZE 96
tapeDCDB->sense_info is 56 bytes:
typedef struct {
...
uint8_t sense_info[56];
} IPS_DCDB_TABLE_TAPE, ...
scb->dcdb.sense_info is 64 bytes:
typedef struct {
...
uint8_t sense_info[64];
...
} IPS_DCDB_TABLE, ...
Copying 96 bytes from either was copying beyond the end of the respective
buffers, leading to potential memory content exposures. Correctly copy
the actual buffer contents and zero pad the remaining bytes.
Signed-off-by: Kees Cook <keescook@chromium.org>
---
drivers/scsi/ips.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index bc33d54a4011..8b33c9871484 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -3344,13 +3344,15 @@ ips_map_status(ips_ha_t * ha, ips_scb_t * scb, ips_stat_t * sp)
IPS_CMD_EXTENDED_DCDB_SG)) {
tapeDCDB =
(IPS_DCDB_TABLE_TAPE *) & scb->dcdb;
- memcpy(scb->scsi_cmd->sense_buffer,
+ memcpy_and_pad(scb->scsi_cmd->sense_buffer,
+ SCSI_SENSE_BUFFERSIZE,
tapeDCDB->sense_info,
- SCSI_SENSE_BUFFERSIZE);
+ sizeof(tapeDCDB->sense_info), 0);
} else {
- memcpy(scb->scsi_cmd->sense_buffer,
+ memcpy_and_pad(scb->scsi_cmd->sense_buffer,
+ SCSI_SENSE_BUFFERSIZE,
scb->dcdb.sense_info,
- SCSI_SENSE_BUFFERSIZE);
+ sizeof(scb->dcdb.sense_info), 0);
}
device_error = 2; /* check condition */
}
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] scsi: ips: Avoid over-read of sense buffer
2021-06-16 21:24 [PATCH] scsi: ips: Avoid over-read of sense buffer Kees Cook
@ 2021-06-19 3:29 ` Martin K. Petersen
0 siblings, 0 replies; 2+ messages in thread
From: Martin K. Petersen @ 2021-06-19 3:29 UTC (permalink / raw)
To: Kees Cook
Cc: Martin K. Petersen, Adaptec OEM Raid Solutions,
James E.J. Bottomley, linux-kernel, linux-scsi, linux-hardening
Kees,
> In preparation for FORTIFY_SOURCE performing compile-time and run-time
> field bounds checking for memcpy() avoid intentionally reading across
> neighboring array fields.
Applied to 5.14/scsi-staging, thanks!
Strictly speaking padding shouldn't be necessary but this isn't fast
path so no big deal.
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-06-19 3:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-16 21:24 [PATCH] scsi: ips: Avoid over-read of sense buffer Kees Cook
2021-06-19 3:29 ` Martin K. Petersen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.