2023-01-09 15:49:25

by Clément Léger

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

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 <[email protected]>
Reviewed-by: Horatiu Vultur <[email protected]>
---
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


2023-01-09 18:57:41

by Jiri Pirko

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

Mon, Jan 09, 2023 at 04:32:23PM CET, [email protected] 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 <[email protected]>
>Reviewed-by: Horatiu Vultur <[email protected]>

Reviewed-by: Jiri Pirko <[email protected]>

2023-01-11 08:59:08

by patchwork-bot+netdevbpf

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

Hello:

This patch was applied to netdev/net.git (master)
by David S. Miller <[email protected]>:

On Mon, 9 Jan 2023 16:32:23 +0100 you 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 <[email protected]>
> Reviewed-by: Horatiu Vultur <[email protected]>
>
> [...]

Here is the summary with links:
- [net,v2] net: lan966x: check for ptp to be enabled in lan966x_ptp_deinit()
https://git.kernel.org/netdev/net/c/b0e380b5d427

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html