lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SCSI] scsi: sd, sr, st, and scsi_lib all fail to copy cmd_len to new cmd

Browse Source 
This fixes an issue in scsi command initialization from a request
where sd, sr, st, and scsi_lib all fail to copy the request's
cmd_len to the scsi command's cmd_len field.

Signed-off-by: Timothy Thelin <timothy.thelin@wdc.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
Timothy Thelin
2005-09-13 19:56:28 -07:00
committed by James Bottomley
parent a89f29f6ea
commit 186d330e68
4 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/scsi/scsi_lib.c
View File

@@ -1268,6 +1268,7 @@ static int scsi_prep_fn(struct request_queue *q, struct request *req)
} }
} else { } else {
memcpy(cmd->cmnd, req->cmd, sizeof(cmd->cmnd)); memcpy(cmd->cmnd, req->cmd, sizeof(cmd->cmnd));
cmd->cmd_len = req->cmd_len;
if (rq_data_dir(req) == WRITE) if (rq_data_dir(req) == WRITE)
cmd->sc_data_direction = DMA_TO_DEVICE; cmd->sc_data_direction = DMA_TO_DEVICE;
else if (req->data_len) else if (req->data_len)

1
drivers/scsi/sd.c
View File

@@ -235,6 +235,7 @@ static int sd_init_command(struct scsi_cmnd * SCpnt)
return 0; return 0;
memcpy(SCpnt->cmnd, rq->cmd, sizeof(SCpnt->cmnd)); memcpy(SCpnt->cmnd, rq->cmd, sizeof(SCpnt->cmnd));
SCpnt->cmd_len = rq->cmd_len;
if (rq_data_dir(rq) == WRITE) if (rq_data_dir(rq) == WRITE)
SCpnt->sc_data_direction = DMA_TO_DEVICE; SCpnt->sc_data_direction = DMA_TO_DEVICE;
else if (rq->data_len) else if (rq->data_len)

1
drivers/scsi/sr.c
View File

@@ -326,6 +326,7 @@ static int sr_init_command(struct scsi_cmnd * SCpnt)
return 0; return 0;
memcpy(SCpnt->cmnd, rq->cmd, sizeof(SCpnt->cmnd)); memcpy(SCpnt->cmnd, rq->cmd, sizeof(SCpnt->cmnd));
SCpnt->cmd_len = rq->cmd_len;
if (!rq->data_len) if (!rq->data_len)
SCpnt->sc_data_direction = DMA_NONE; SCpnt->sc_data_direction = DMA_NONE;
else if (rq_data_dir(rq) == WRITE) else if (rq_data_dir(rq) == WRITE)

1
drivers/scsi/st.c
View File

@@ -4206,6 +4206,7 @@ static int st_init_command(struct scsi_cmnd *SCpnt)
return 0; return 0;
memcpy(SCpnt->cmnd, rq->cmd, sizeof(SCpnt->cmnd)); memcpy(SCpnt->cmnd, rq->cmd, sizeof(SCpnt->cmnd));
SCpnt->cmd_len = rq->cmd_len;
if (rq_data_dir(rq) == WRITE) if (rq_data_dir(rq) == WRITE)
SCpnt->sc_data_direction = DMA_TO_DEVICE; SCpnt->sc_data_direction = DMA_TO_DEVICE;