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

Commit 6d7938f4 authored by Dave Jiang's avatar Dave Jiang Committed by James Bottomley
Browse files

[SCSI] isci: Fix NULL ptr dereference when no firmware is being loaded 



NULL orom ptr passed in for verification which caused page fault.
We will set a default version when we don't have orom struct.

Reported-by: default avatarDan Melnic <dan@seamicro.com>
Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent a92fa25c

drivers/scsi/isci/host.c

+3 −1
Original line number Diff line number Diff line
@@ -1848,9 +1848,11 @@ static enum sci_status sci_oem_parameters_set(struct isci_host *ihost) 
	if (state == SCIC_RESET ||

	    state == SCIC_INITIALIZING ||

	    state == SCIC_INITIALIZED) {

		u8 oem_version = pci_info->orom ? pci_info->orom->hdr.version :

			ISCI_ROM_VER_1_0;



		if (sci_oem_parameters_validate(&ihost->oem_parameters,

						pci_info->orom->hdr.version))

						oem_version))

			return SCI_FAILURE_INVALID_PARAMETER_VALUE;



		return SCI_SUCCESS;