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

Commit 2fb13e20 authored by Kangjie Lu's avatar Kangjie Lu Committed by Greg Kroah-Hartman
Browse files

net: netxen: fix a missing check and an uninitialized use 



[ Upstream commit d134e486e831defd26130770181f01dfc6195f7d ]

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: default avatarKangjie Lu <kjlu@umn.edu>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 8bb68ed8

drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c

+2 −1
Original line number Diff line number Diff line
@@ -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]);