linux-scsi@xxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx, martin.petersen@xxxxxxxxxx Bcc: Subject: [PATCH] scsi_lib fix the NULL pointer dereference Reply-To: scsi_setup_scsi_cmnd should check for the pointer before scsi_command_size dereferences it. Signed-off-by: Thelford Williams <tdwilliamsiv@xxxxxxxxx> --- drivers/scsi/scsi_lib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 572673873ddf..9abaacd6db67 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -1174,7 +1174,7 @@ static blk_status_t scsi_setup_scsi_cmnd(struct scsi_device *sdev, } cmd->cmd_len = scsi_req(req)->cmd_len; - if (cmd->cmd_len == 0) + if (cmd->cmd_len == 0 && cmd->cmnd) cmd->cmd_len = scsi_command_size(cmd->cmnd); cmd->cmnd = scsi_req(req)->cmd; cmd->transfersize = blk_rq_bytes(req); -- 2.25.1
