Messages in this thread | | | From | Shannon Nelson <> | Date | Wed, 26 Dec 2018 10:08:28 -0800 | Subject | Re: [PATCH] ethernet: (niu) fix missing checks of niu_pci_eeprom_read |
| |
On Mon, Dec 24, 2018 at 11:58 PM Kangjie Lu <kjlu@umn.edu> wrote: > > 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> > --- > drivers/net/ethernet/sun/niu.c | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c > index 9319d84bf49f..d84501441edd 100644 > --- a/drivers/net/ethernet/sun/niu.c > +++ b/drivers/net/ethernet/sun/niu.c > @@ -8100,6 +8100,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; > @@ -8144,8 +8146,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; > -- > 2.17.2 (Apple Git-113) >
Acked-by: Shannon Nelson <shannon.lee.nelson@gmail.com>
-- ============================================== Mr. Shannon Nelson Parents can't afford to be squeamish.
| |