Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

niu: fix missing checks of niu_pci_eeprom_read

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

Signed-off-by: Kangjie Lu <kjlu@umn.edu>
Acked-by: Shannon Nelson <shannon.lee.nelson@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Kangjie Lu and committed by
David S. Miller
26fd962b ca19fcb6

+8 -2
+8 -2
drivers/net/ethernet/sun/niu.c
··· 8100 8100 start += 3; 8101 8101 8102 8102 prop_len = niu_pci_eeprom_read(np, start + 4); 8103 + if (prop_len < 0) 8104 + return prop_len; 8103 8105 err = niu_pci_vpd_get_propname(np, start + 5, namebuf, 64); 8104 8106 if (err < 0) 8105 8107 return err; ··· 8146 8144 netif_printk(np, probe, KERN_DEBUG, np->dev, 8147 8145 "VPD_SCAN: Reading in property [%s] len[%d]\n", 8148 8146 namebuf, prop_len); 8149 - for (i = 0; i < prop_len; i++) 8150 - *prop_buf++ = niu_pci_eeprom_read(np, off + i); 8147 + for (i = 0; i < prop_len; i++) { 8148 + err = niu_pci_eeprom_read(np, off + i); 8149 + if (err >= 0) 8150 + *prop_buf = err; 8151 + ++prop_buf; 8152 + } 8151 8153 } 8152 8154 8153 8155 start += len;