diff options
author | Dave Jiang <dave.jiang@intel.com> | 2012-01-27 14:17:37 -0500 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2012-02-18 09:37:00 -0500 |
commit | 6d7938f46f89c9773f9396c1d13b20bbc5c6d95b (patch) | |
tree | aac6b7756ec3952caf5a9c1b96822eaacf3cb77c /drivers | |
parent | a92fa25c63a788758bd52e9123504d133210c8b7 (diff) |
[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: Dan Melnic <dan@seamicro.com>
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/scsi/isci/host.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/isci/host.c b/drivers/scsi/isci/host.c index 1a65d6514237..418391b1c361 100644 --- a/drivers/scsi/isci/host.c +++ b/drivers/scsi/isci/host.c | |||
@@ -1848,9 +1848,11 @@ static enum sci_status sci_oem_parameters_set(struct isci_host *ihost) | |||
1848 | if (state == SCIC_RESET || | 1848 | if (state == SCIC_RESET || |
1849 | state == SCIC_INITIALIZING || | 1849 | state == SCIC_INITIALIZING || |
1850 | state == SCIC_INITIALIZED) { | 1850 | state == SCIC_INITIALIZED) { |
1851 | u8 oem_version = pci_info->orom ? pci_info->orom->hdr.version : | ||
1852 | ISCI_ROM_VER_1_0; | ||
1851 | 1853 | ||
1852 | if (sci_oem_parameters_validate(&ihost->oem_parameters, | 1854 | if (sci_oem_parameters_validate(&ihost->oem_parameters, |
1853 | pci_info->orom->hdr.version)) | 1855 | oem_version)) |
1854 | return SCI_FAILURE_INVALID_PARAMETER_VALUE; | 1856 | return SCI_FAILURE_INVALID_PARAMETER_VALUE; |
1855 | 1857 | ||
1856 | return SCI_SUCCESS; | 1858 | return SCI_SUCCESS; |