Patch "sfp: fix EEPROM reading in the case of non-SFF8472 SFPs" has been added to the 4.15-stable tree

This is a note to let you know that I've just added the patch titled

sfp: fix EEPROM reading in the case of non-SFF8472 SFPs

to the 4.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
sfp-fix-eeprom-reading-in-the-case-of-non-sff8472-sfps.patch
and it can be found in the queue-4.15 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Russell King <[email protected]>
Date: Fri, 15 Dec 2017 16:09:41 +0000
Subject: sfp: fix EEPROM reading in the case of non-SFF8472 SFPs

From: Russell King <[email protected]>

[ Upstream commit 2794ffc441dde3109804085dc745e8014a4de224 ]

The EEPROM reading was trying to read from the second EEPROM address if we requested the last byte from the SFF8079 EEPROM, which caused a failure when the second EEPROM is not present. Discovered with a S-RJ01 SFP module. Fix this.

---
 drivers/net/phy/sfp.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

@@ -683,20 +683,19 @@ static int sfp_module_eeprom(struct sfp
 		len = min_t(unsigned int, last, ETH_MODULE_SFF_8079_LEN);
 		len -= first;
 
-		ret = sfp->read(sfp, false, first, data, len);
+		ret = sfp_read(sfp, false, first, data, len);
 		if (ret < 0)
 			return ret;
 
 		first += len;
 		data += len;
 	}
-	if (first >= ETH_MODULE_SFF_8079_LEN &&
-	    first < ETH_MODULE_SFF_8472_LEN) {
+	if (first < ETH_MODULE_SFF_8472_LEN && last > ETH_MODULE_SFF_8079_LEN) {
 		len = min_t(unsigned int, last, ETH_MODULE_SFF_8472_LEN);
 		len -= first;
 		first -= ETH_MODULE_SFF_8079_LEN;
 
-		ret = sfp->read(sfp, true, first, data, len);
+		ret = sfp_read(sfp, true, first, data, len);
 		if (ret < 0)
 			return ret;
 	}

Patches currently in stable-queue which might be from [email protected] are

queue-4.15/sfp-fix-non-detection-of-phy.patch queue-4.15/sfp-fix-eeprom-reading-in-the-case-of-non-sff8472-sfps.patch