From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-by2nam03on0124.outbound.protection.outlook.com ([104.47.42.124]:6433 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S935243AbeCHE6z (ORCPT ); Wed, 7 Mar 2018 23:58:55 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Russell King , "David S . Miller" , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 32/67] sfp: fix EEPROM reading in the case of non-SFF8472 SFPs Date: Thu, 8 Mar 2018 04:57:45 +0000 Message-ID: <20180308045641.7814-32-alexander.levin@microsoft.com> References: <20180308045641.7814-1-alexander.levin@microsoft.com> In-Reply-To: <20180308045641.7814-1-alexander.levin@microsoft.com> Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org List-ID: From: Russell King [ 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. Fixes: 73970055450e ("sfp: add SFP module support") Signed-off-by: Russell King Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/phy/sfp.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c index 8bf10aba7452..ddf184db9c45 100644 --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c @@ -667,20 +667,19 @@ static int sfp_module_eeprom(struct sfp *sfp, struct = ethtool_eeprom *ee, len =3D min_t(unsigned int, last, ETH_MODULE_SFF_8079_LEN); len -=3D first; =20 - ret =3D sfp->read(sfp, false, first, data, len); + ret =3D sfp_read(sfp, false, first, data, len); if (ret < 0) return ret; =20 first +=3D len; data +=3D len; } - if (first >=3D 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 =3D min_t(unsigned int, last, ETH_MODULE_SFF_8472_LEN); len -=3D first; first -=3D ETH_MODULE_SFF_8079_LEN; =20 - ret =3D sfp->read(sfp, true, first, data, len); + ret =3D sfp_read(sfp, true, first, data, len); if (ret < 0) return ret; } --=20 2.14.1