Skip to content

Commit 1bad6c4

Browse files
longlimsftmartinkpetersen
authored andcommitted
scsi: zero per-cmd private driver data for each MQ I/O
In lower layer driver's (LLD) scsi_host_template, the driver may optionally ask SCSI to allocate its private driver memory for each command, by specifying cmd_size. This memory is allocated at the end of scsi_cmnd by SCSI. Later when SCSI queues a command, the LLD can use scsi_cmd_priv to get to its private data. Some LLD, e.g. hv_storvsc, doesn't clear its private data before use. In this case, the LLD may get to stale or uninitialized data in its private driver memory. This may result in unexpected driver and hardware behavior. Fix this problem by also zeroing the private driver memory before passing them to LLD. Signed-off-by: Long Li <longli@microsoft.com> Reviewed-by: Bart Van Assche <Bart.VanAssche@sandisk.com> Reviewed-by: KY Srinivasan <kys@microsoft.com> Reviewed-by: Christoph Hellwig <hch@infradead.org> CC: <stable@vger.kernel.org> # 4.11+ Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent a351e40 commit 1bad6c4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/scsi/scsi_lib.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1851,7 +1851,7 @@ static int scsi_mq_prep_fn(struct request *req)
18511851

18521852
/* zero out the cmd, except for the embedded scsi_request */
18531853
memset((char *)cmd + sizeof(cmd->req), 0,
1854-
sizeof(*cmd) - sizeof(cmd->req));
1854+
sizeof(*cmd) - sizeof(cmd->req) + shost->hostt->cmd_size);
18551855

18561856
req->special = cmd;
18571857

0 commit comments

Comments
 (0)