diff options
| author | Kangjie Lu <kjlu@umn.edu> | 2018-12-21 00:22:32 -0600 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-12-21 09:01:47 -0800 |
| commit | d134e486e831defd26130770181f01dfc6195f7d (patch) | |
| tree | ea068e4e901b4d391436c58352a3b37ffd1123a8 | |
| parent | f0c928d878e7d01b613c9ae5c971a6b1e473a938 (diff) | |
| download | linux-stable-d134e486e831defd26130770181f01dfc6195f7d.tar.gz linux-stable-d134e486e831defd26130770181f01dfc6195f7d.tar.bz2 linux-stable-d134e486e831defd26130770181f01dfc6195f7d.zip | |
net: netxen: fix a missing check and an uninitialized use
When netxen_rom_fast_read() fails, "bios" is left uninitialized and may
contain random value, thus should not be used.
The fix ensures that if netxen_rom_fast_read() fails, we return "-EIO".
Signed-off-by: Kangjie Lu <kjlu@umn.edu>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c index 0ea141ece19e..6547a9dd5935 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c @@ -1125,7 +1125,8 @@ netxen_validate_firmware(struct netxen_adapter *adapter) return -EINVAL; } val = nx_get_bios_version(adapter); - netxen_rom_fast_read(adapter, NX_BIOS_VERSION_OFFSET, (int *)&bios); + if (netxen_rom_fast_read(adapter, NX_BIOS_VERSION_OFFSET, (int *)&bios)) + return -EIO; if ((__force u32)val != bios) { dev_err(&pdev->dev, "%s: firmware bios is incompatible\n", fw_name[fw_type]); |