From b896d6e6e524451d3912eb83c57e1cb952d8f84b Mon Sep 17 00:00:00 2001

From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Date: Mon, 3 May 2021 13:56:49 +0200

Subject: [PATCH 14/19] Revert "niu: fix missing checks of niu_pci_eeprom_read"

Git-commit: 7930742d6a0ff091c85b92ef4e076432d8d8cb79

Patch-mainline: v5.13-rc3

References: git-fixes

This reverts commit 26fd962bde0b15e54234fe762d86bc0349df1de4.

Because of recent interactions with developers from @umn.edu, all

commits from them have been recently re-reviewed to ensure if they were

correct or not.

Upon review, this commit was found to be incorrect for the reasons

below, so it must be reverted.  It will be fixed up "correctly" in a

later kernel change.

The change here was incorrect.  While it is nice to check if

niu_pci_eeprom_read() succeeded or not when using the data, any error

that might have happened was not propagated upwards properly, causing

the kernel to assume that these reads were successful, which results in

invalid data in the buffer that was to contain the successfully read

data.

Cc: Kangjie Lu <kjlu@umn.edu>

Cc: Shannon Nelson <shannon.lee.nelson@gmail.com>

Cc: David S. Miller <davem@davemloft.net>

Fixes: 26fd962bde0b ("niu: fix missing checks of niu_pci_eeprom_read")

Cc: stable <stable@vger.kernel.org>

Link: https://lore.kernel.org/r/20210503115736.2104747-23-gregkh@linuxfoundation.org

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Signed-off-by: Denis Kirjanov <denis.kirjanov@suse.com>

---

 drivers/net/ethernet/sun/niu.c | 10 ++--------

 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c

index 3f0e34bdf772..1c0aee4ada92 100644

--- a/drivers/net/ethernet/sun/niu.c

+++ b/drivers/net/ethernet/sun/niu.c

@@ -8119,8 +8119,6 @@ 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;

@@ -8165,12 +8163,8 @@ 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++) {

-				err = niu_pci_eeprom_read(np, off + i);

-				if (err >= 0)

-					*prop_buf = err;

-				++prop_buf;

-			}

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

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

 		}

 		start += len;

-- 

2.16.4