[v2] net: lan966x: check for ptp to be enabled in lan966x_ptp_deinit()

[PATCH net v2] net: lan966x: check for ptp to be enabled in lan966x_ptp_deinit()

Posted by Clément Léger 2 years, 8 months ago

If ptp was not enabled due to missing IRQ for instance,
lan966x_ptp_deinit() will dereference NULL pointers.

Fixes: d096459494a8 ("net: lan966x: Add support for ptp clocks")
Signed-off-by: Clément Léger <clement.leger@bootlin.com>
Reviewed-by: Horatiu Vultur <horatiu.vultur@microchip.com>
---
Changes in v2:
 - Added Reviewed-by: Horatiu Vultur
 - Added net in patch subject to target net tree

 drivers/net/ethernet/microchip/lan966x/lan966x_ptp.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_ptp.c b/drivers/net/ethernet/microchip/lan966x/lan966x_ptp.c
index f9ebfaafbebc..a8348437dd87 100644
--- a/drivers/net/ethernet/microchip/lan966x/lan966x_ptp.c
+++ b/drivers/net/ethernet/microchip/lan966x/lan966x_ptp.c
@@ -1073,6 +1073,9 @@ void lan966x_ptp_deinit(struct lan966x *lan966x)
 	struct lan966x_port *port;
 	int i;
 
+	if (!lan966x->ptp)
+		return;
+
 	for (i = 0; i < lan966x->num_phys_ports; i++) {
 		port = lan966x->ports[i];
 		if (!port)
-- 
2.38.1

Re: [PATCH net v2] net: lan966x: check for ptp to be enabled in lan966x_ptp_deinit()

Posted by Jiri Pirko 2 years, 8 months ago

Mon, Jan 09, 2023 at 04:32:23PM CET, clement.leger@bootlin.com wrote:
>If ptp was not enabled due to missing IRQ for instance,
>lan966x_ptp_deinit() will dereference NULL pointers.
>
>Fixes: d096459494a8 ("net: lan966x: Add support for ptp clocks")
>Signed-off-by: Clément Léger <clement.leger@bootlin.com>
>Reviewed-by: Horatiu Vultur <horatiu.vultur@microchip.com>

Reviewed-by: Jiri Pirko <jiri@nvidia.com>