Commit 79e448bf authored by Matthew Dobson's avatar Matthew Dobson Committed by Linus Torvalds
Browse files

[PATCH] Fix a bug in scsi_get_command 



scsi_get_command() attempts to write into a structure that may not have
been successfully allocated.  Move this write inside the if statement that
ensures we won't panic the kernel with a NULL pointer dereference.

Signed-off-by: default avatarMatthew Dobson <colpatch@us.ibm.com>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e738cf6d

drivers/scsi/scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -265,10 +265,10 @@ struct scsi_cmnd *scsi_get_command(struct scsi_device *dev, gfp_t gfp_mask) 
		spin_lock_irqsave(&dev->list_lock, flags);

		list_add_tail(&cmd->list, &dev->cmd_list);

		spin_unlock_irqrestore(&dev->list_lock, flags);

		cmd->jiffies_at_alloc = jiffies;

	} else

		put_device(&dev->sdev_gendev);



	cmd->jiffies_at_alloc = jiffies;

	return cmd;

}				

EXPORT_SYMBOL(scsi_get_command);