Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d49c2077 authored by Don Brace's avatar Don Brace Committed by Martin K. Petersen
Browse files

scsi: hpsa: Check for null device pointers 



A device can be deleted causing NULL pointer issues.

Reviewed-by: default avatarScott Benesh <scott.benesh@microsemi.com>
Reviewed-by: default avatarScott Teel <scott.teel@microsemi.com>
Reviewed-by: default avatarKevin Barnett <kevin.barnett@microsemi.com>
Signed-off-by: default avatarDon Brace <don.brace@microsemi.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 86cf7130

drivers/scsi/hpsa.c

+17 −3
Original line number Diff line number Diff line
@@ -2388,6 +2388,7 @@ static void hpsa_cmd_free_and_done(struct ctlr_info *h, 
		struct CommandList *c, struct scsi_cmnd *cmd)

{

	hpsa_cmd_resolve_and_free(h, c);

	if (cmd && cmd->scsi_done)

		cmd->scsi_done(cmd);

}
@@ -2489,6 +2490,12 @@ static void complete_scsi_command(struct CommandList *cp) 
	ei = cp->err_info;

	cmd = cp->scsi_cmd;

	h = cp->h;



	if (!cmd->device) {

		cmd->result = DID_NO_CONNECT << 16;

		return hpsa_cmd_free_and_done(h, cp, cmd);

	}



	dev = cmd->device->hostdata;

	c2 = &h->ioaccel2_cmd_pool[cp->cmdindex];
@@ -2504,8 +2511,15 @@ static void complete_scsi_command(struct CommandList *cp) 
	cmd->result = (DID_OK << 16); 		/* host byte */

	cmd->result |= (COMMAND_COMPLETE << 8);	/* msg byte */



	if (cp->cmd_type == CMD_IOACCEL2 || cp->cmd_type == CMD_IOACCEL1)

	if (cp->cmd_type == CMD_IOACCEL2 || cp->cmd_type == CMD_IOACCEL1) {

		if (dev->physical_device && dev->expose_device &&

			dev->removed) {

			cmd->result = DID_NO_CONNECT << 16;

			return hpsa_cmd_free_and_done(h, cp, cmd);

		}

		if (likely(cp->phys_disk != NULL))

			atomic_dec(&cp->phys_disk->ioaccel_cmds_out);

	}



	/*

	 * We check for lockup status here as it may be set for