[PATCH AUTOSEL 3.18 53/61] niu: fix missing checks of niu_pci_eeprom_read

[Sasha Levin]

From: Kangjie Lu <k...@umn.edu>

[ Upstream commit 26fd962bde0b15e54234fe762d86bc0349df1de4 ]

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

Signed-off-by: Kangjie Lu <k...@umn.edu>
Acked-by: Shannon Nelson <shannon.lee.nel...@gmail.com>
Signed-off-by: David S. Miller <da...@davemloft.net>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 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 68738aa8e218..e87bded39781 100644
--- a/drivers/net/ethernet/sun/niu.c
+++ b/drivers/net/ethernet/sun/niu.c
@@ -8131,6 +8131,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;
@@ -8175,8 +8177,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.19.1