[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20240307111906.297749-1-kevin.lhopital@savoirfairelinux.com>
Date: Thu, 7 Mar 2024 12:19:06 +0100
From: Kévin L'hôpital <kevin.lhopital@...oirfairelinux.com>
To: Andrew Lunn <andrew@...n.ch>,
Heiner Kallweit <hkallweit1@...il.com>,
Russell King <linux@...linux.org.uk>,
"David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>,
Dan Murphy <dmurphy@...com>
Cc: netdev@...r.kernel.org,
linux-kernel@...r.kernel.org,
Kévin L'hôpital <kevin.lhopital@...oirfairelinux.com>,
Enguerrand de Ribaucourt <enguerrand.de-ribaucourt@...oirfairelinux.com>,
Russell King <rmk+kernel@...linux.org.uk>
Subject: [PATCH v2] net: phy: fix phy_get_internal_delay accessing an empty array
The phy_get_internal_delay function could try to access to an empty
array in the case that the driver is calling phy_get_internal_delay
without defining delay_values and rx-internal-delay-ps or
tx-internal-delay-ps is defined to 0 in the device-tree.
This will lead to "unable to handle kernel NULL pointer dereference at
virtual address 0". To avoid this kernel oops, the test should be delay
>= 0. As there is already delay < 0 test just before, the test could
only be size == 0.
Fixes: 92252eec913b ("net: phy: Add a helper to return the index for of the internal delay")
Co-developed-by: Enguerrand de Ribaucourt <enguerrand.de-ribaucourt@...oirfairelinux.com>
Signed-off-by: Enguerrand de Ribaucourt <enguerrand.de-ribaucourt@...oirfairelinux.com>
Signed-off-by: Kévin L'hôpital <kevin.lhopital@...oirfairelinux.com>
Reviewed-by: Russell King (Oracle) <rmk+kernel@...linux.org.uk>
---
V1 -> V2: Fixed Signed-off-by tags
drivers/net/phy/phy_device.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 3611ea64875e..3ad9bbf65cbe 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -2959,7 +2959,7 @@ s32 phy_get_internal_delay(struct phy_device *phydev, struct device *dev,
if (delay < 0)
return delay;
- if (delay && size == 0)
+ if (size == 0)
return delay;
if (delay < delay_values[0] || delay > delay_values[size - 1]) {
--
2.34.1
Powered by blists - more mailing lists