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

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

niu: fix missing checks of niu_pci_eeprom_read 



[ Upstream commit 26fd962bde0b15e54234fe762d86bc0349df1de4 ]

niu_pci_eeprom_read() may fail, so we should check its return value
before using the read data.

Signed-off-by: default avatarKangjie Lu <kjlu@umn.edu>
Acked-by: default avatarShannon Nelson <shannon.lee.nelson@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent e8f13f32

drivers/net/ethernet/sun/niu.c

+8 −2
Original line number Diff line number Diff line
@@ -8119,6 +8119,8 @@ static int niu_pci_vpd_scan_props(struct niu *np, u32 start, u32 end) 
		start += 3;



		prop_len = niu_pci_eeprom_read(np, start + 4);

		if (prop_len < 0)

			return prop_len;

		err = niu_pci_vpd_get_propname(np, start + 5, namebuf, 64);

		if (err < 0)

			return err;
@@ -8163,8 +8165,12 @@ static int niu_pci_vpd_scan_props(struct niu *np, u32 start, u32 end) 
			netif_printk(np, probe, KERN_DEBUG, np->dev,

				     "VPD_SCAN: Reading in property [%s] len[%d]\n",

				     namebuf, prop_len);

			for (i = 0; i < prop_len; i++)

				*prop_buf++ = niu_pci_eeprom_read(np, off + i);

			for (i = 0; i < prop_len; i++) {

				err = niu_pci_eeprom_read(np, off + i);

				if (err >= 0)

					*prop_buf = err;

				++prop_buf;

			}

		}



		start += len;