git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From d5d790ba1558dbb8d179054f514476e2ee970b8e Mon Sep 17 00:00:00 2001
   2 From: Bhanu Seshu Kumar Valluri <bhanuseshukumar@gmail.com>
   3 Date: Thu, 9 Oct 2025 11:00:09 +0530
   4 Subject: net: usb: lan78xx: Fix lost EEPROM write timeout error(-ETIMEDOUT) in lan78xx_write_raw_eeprom
   5
   6 From: Bhanu Seshu Kumar Valluri <bhanuseshukumar@gmail.com>
   7
   8 commit d5d790ba1558dbb8d179054f514476e2ee970b8e upstream.
   9
  10 The function lan78xx_write_raw_eeprom failed to properly propagate EEPROM
  11 write timeout errors (-ETIMEDOUT). In the timeout  fallthrough path, it first
  12 attempted to restore the pin configuration for LED outputs and then
  13 returned only the status of that restore operation, discarding the
  14 original timeout error saved in ret.
  15
  16 As a result, callers could mistakenly treat EEPROM write operation as
  17 successful even though the EEPROM write had actually timed out with no
  18 or partial data write.
  19
  20 To fix this, handle errors in restoring the LED pin configuration separately.
  21 If the restore succeeds, return any prior EEPROM write timeout error saved
  22 in ret to the caller.
  23
  24 Suggested-by: Oleksij Rempel <o.rempel@pengutronix.de>
  25 Fixes: 8b1b2ca83b20 ("net: usb: lan78xx: Improve error handling in EEPROM and OTP operations")
  26 cc: stable@vger.kernel.org
  27 Signed-off-by: Bhanu Seshu Kumar Valluri <bhanuseshukumar@gmail.com>
  28 Reviewed-by: Simon Horman <horms@kernel.org>
  29 Signed-off-by: David S. Miller <davem@davemloft.net>
  30 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  31 ---
  32  drivers/net/usb/lan78xx.c |   11 +++++++----
  33  1 file changed, 7 insertions(+), 4 deletions(-)
  34
  35 --- a/drivers/net/usb/lan78xx.c
  36 +++ b/drivers/net/usb/lan78xx.c
  37 @@ -1174,10 +1174,13 @@ static int lan78xx_write_raw_eeprom(stru
  38         }
  39
  40  write_raw_eeprom_done:
  41 -       if (dev->chipid == ID_REV_CHIP_ID_7800_)
  42 -               return lan78xx_write_reg(dev, HW_CFG, saved);
  43 -
  44 -       return 0;
  45 +       if (dev->chipid == ID_REV_CHIP_ID_7800_) {
  46 +               int rc = lan78xx_write_reg(dev, HW_CFG, saved);
  47 +               /* If USB fails, there is nothing to do */
  48 +               if (rc < 0)
  49 +                       return rc;
  50 +       }
  51 +       return ret;
  52  }
  53
  54  static int lan78xx_read_raw_otp(struct lan78xx_net *dev, u32 offset,