summary refs log tree commit diff
path: root/drivers/scsi/constants.c
diff options
context:
space:
mode:
authorMartin K. Petersen <martin.petersen@oracle.com>2010-01-20 02:20:43 -0500
committerJames Bottomley <James.Bottomley@suse.de>2010-02-19 11:15:33 -0600
commit77c9cfc51b0d732b2524799810fb30018074fd60 (patch)
tree3f017828710e8bab9e172204a2ef5f2e9544d379 /drivers/scsi/constants.c
parent8475f688d796b875bf98ed161acd53d00a1483ff (diff)
downloadlinux-77c9cfc51b0d732b2524799810fb30018074fd60.tar.gz
[SCSI] Fix printing of failed 32-byte commands
Having the large CDB allocation logic in sd.c means that
scsi_io_completion does not have access to the command buffer. That in
turn causes garbage to be printed when a 32-byte command fails. Move the
command printing to sd_done where the command buffer is intact.  Clear
the command buffer pointer after the extended CDB has been freed.

Make scsi_print_command ignore commands with NULL CDB pointers to
inhibit printing of garbled command strings.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Boaz Harrosh <bharrosh@panasas.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/constants.c')
-rw-r--r--drivers/scsi/constants.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
index 7092ff67ecd3..cd05e049d5f6 100644
--- a/drivers/scsi/constants.c
+++ b/drivers/scsi/constants.c
@@ -346,6 +346,9 @@ void scsi_print_command(struct scsi_cmnd *cmd)
 {
 	int k;
 
+	if (cmd->cmnd == NULL)
+		return;
+
 	scmd_printk(KERN_INFO, cmd, "CDB: ");
 	print_opcode_name(cmd->cmnd, cmd->cmd_len);