Commit db111e18 authored Jun 03, 2011 by Stephen M. Cameron Committed by James Bottomley Jun 29, 2011

[SCSI] hpsa: fix potential overrun while memcpy'ing sense data



This memcpy:

   memcpy(cmd->sense_buffer, ei->SenseInfo,
	   ei->SenseLen > SCSI_SENSE_BUFFERSIZE ?
		   SCSI_SENSE_BUFFERSIZE :
		   ei->SenseLen);

The ei->SenseLen field is filled in by the Smart Array.  For requests to
logical drives, it will not exceed 32 bytes, so should be ok, but for physical
requests it depends on the target device, not the Smart Array.  It's conceivable
that this could exceed the 32 byte size of ei->SenseInfo.  In that case, the memcpy
would read past the end of ei->SenseInfo, copying data from the next command,
as if it were sense data, or, if it happened to be the very last command in the
block of allocated commands, could fall off the end of the allocated area and
crash.  I'm not aware of anyone ever encountering this behavior, but it could
conceivably happen.  This bug was found by Coverity.

Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

parent c2dd32e0

drivers/scsi/hpsa.c

+9 −4

Original line number	Diff line number	Diff line
		@@ -1037,6 +1037,7 @@ static void complete_scsi_command(struct CommandList *cp)
		unsigned char sense_key;
		unsigned char asc; /* additional sense code */
		unsigned char ascq; /* additional sense code qualifier */
		unsigned long sense_data_size;

		ei = cp->err_info;
		cmd = (struct scsi_cmnd *) cp->scsi_cmd;
		@@ -1051,10 +1052,14 @@ static void complete_scsi_command(struct CommandList *cp)
		cmd->result \|= ei->ScsiStatus;

		/* copy the sense data whether we need to or not. */
		memcpy(cmd->sense_buffer, ei->SenseInfo,
		ei->SenseLen > SCSI_SENSE_BUFFERSIZE ?
		SCSI_SENSE_BUFFERSIZE :
		ei->SenseLen);
		if (SCSI_SENSE_BUFFERSIZE < sizeof(ei->SenseInfo))
		sense_data_size = SCSI_SENSE_BUFFERSIZE;
		else
		sense_data_size = sizeof(ei->SenseInfo);
		if (ei->SenseLen < sense_data_size)
		sense_data_size = ei->SenseLen;

		memcpy(cmd->sense_buffer, ei->SenseInfo, sense_data_size);
		scsi_set_resid(cmd, ei->ResidualCnt);

		if (ei->CommandStatus == 0) {

Admin message