* [PATCH 1/2] net: lan966x: Fix potential null-ptr-deref in lan966x_stats_init()
2022-11-14 13:38 [PATCH 0/2] net: microchip: Fix potential null-ptr-deref due to create_singlethread_workqueue() Shang XiaoJing
@ 2022-11-14 13:38 ` Shang XiaoJing
2022-11-14 14:20 ` Horatiu Vultur
2022-11-14 13:38 ` [PATCH 2/2] net: microchip: sparx5: Fix potential null-ptr-deref in sparx_stats_init() and sparx5_start() Shang XiaoJing
2022-11-16 9:20 ` [PATCH 0/2] net: microchip: Fix potential null-ptr-deref due to create_singlethread_workqueue() patchwork-bot+netdevbpf
2 siblings, 1 reply; 5+ messages in thread
From: Shang XiaoJing @ 2022-11-14 13:38 UTC (permalink / raw)
To: horatiu.vultur, UNGLinuxDriver, davem, edumazet, kuba, pabeni,
lars.povlsen, Steen.Hegelund, daniel.machon, rmk+kernel,
casper.casan, bjarni.jonasson, netdev, linux-arm-kernel
Cc: shangxiaojing
lan966x_stats_init() calls create_singlethread_workqueue() and not
checked the ret value, which may return NULL. And a null-ptr-deref may
happen:
lan966x_stats_init()
create_singlethread_workqueue() # failed, lan966x->stats_queue is NULL
queue_delayed_work()
queue_delayed_work_on()
__queue_delayed_work() # warning here, but continue
__queue_work() # access wq->flags, null-ptr-deref
Check the ret value and return -ENOMEM if it is NULL.
Fixes: 12c2d0a5b8e2 ("net: lan966x: add ethtool configuration and statistics")
Signed-off-by: Shang XiaoJing <shangxiaojing@huawei.com>
---
drivers/net/ethernet/microchip/lan966x/lan966x_ethtool.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_ethtool.c b/drivers/net/ethernet/microchip/lan966x/lan966x_ethtool.c
index e58a27fd8b50..0fb0efc224be 100644
--- a/drivers/net/ethernet/microchip/lan966x/lan966x_ethtool.c
+++ b/drivers/net/ethernet/microchip/lan966x/lan966x_ethtool.c
@@ -708,6 +708,9 @@ int lan966x_stats_init(struct lan966x *lan966x)
snprintf(queue_name, sizeof(queue_name), "%s-stats",
dev_name(lan966x->dev));
lan966x->stats_queue = create_singlethread_workqueue(queue_name);
+ if (!lan966x->stats_queue)
+ return -ENOMEM;
+
INIT_DELAYED_WORK(&lan966x->stats_work, lan966x_check_stats_work);
queue_delayed_work(lan966x->stats_queue, &lan966x->stats_work,
LAN966X_STATS_CHECK_DELAY);
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 1/2] net: lan966x: Fix potential null-ptr-deref in lan966x_stats_init()
2022-11-14 13:38 ` [PATCH 1/2] net: lan966x: Fix potential null-ptr-deref in lan966x_stats_init() Shang XiaoJing
@ 2022-11-14 14:20 ` Horatiu Vultur
0 siblings, 0 replies; 5+ messages in thread
From: Horatiu Vultur @ 2022-11-14 14:20 UTC (permalink / raw)
To: Shang XiaoJing
Cc: UNGLinuxDriver, davem, edumazet, kuba, pabeni, lars.povlsen,
Steen.Hegelund, daniel.machon, rmk+kernel, casper.casan,
bjarni.jonasson, netdev, linux-arm-kernel
The 11/14/2022 21:38, Shang XiaoJing wrote:
> [Some people who received this message don't often get email from shangxiaojing@huawei.com. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ]
>
> lan966x_stats_init() calls create_singlethread_workqueue() and not
> checked the ret value, which may return NULL. And a null-ptr-deref may
> happen:
>
> lan966x_stats_init()
> create_singlethread_workqueue() # failed, lan966x->stats_queue is NULL
> queue_delayed_work()
> queue_delayed_work_on()
> __queue_delayed_work() # warning here, but continue
> __queue_work() # access wq->flags, null-ptr-deref
>
> Check the ret value and return -ENOMEM if it is NULL.
It looks good to me.
Reviewed-by: Horatiu Vultur <horatiu.vultur@microchip.com>
>
> Fixes: 12c2d0a5b8e2 ("net: lan966x: add ethtool configuration and statistics")
> Signed-off-by: Shang XiaoJing <shangxiaojing@huawei.com>
> ---
> drivers/net/ethernet/microchip/lan966x/lan966x_ethtool.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_ethtool.c b/drivers/net/ethernet/microchip/lan966x/lan966x_ethtool.c
> index e58a27fd8b50..0fb0efc224be 100644
> --- a/drivers/net/ethernet/microchip/lan966x/lan966x_ethtool.c
> +++ b/drivers/net/ethernet/microchip/lan966x/lan966x_ethtool.c
> @@ -708,6 +708,9 @@ int lan966x_stats_init(struct lan966x *lan966x)
> snprintf(queue_name, sizeof(queue_name), "%s-stats",
> dev_name(lan966x->dev));
> lan966x->stats_queue = create_singlethread_workqueue(queue_name);
> + if (!lan966x->stats_queue)
> + return -ENOMEM;
> +
> INIT_DELAYED_WORK(&lan966x->stats_work, lan966x_check_stats_work);
> queue_delayed_work(lan966x->stats_queue, &lan966x->stats_work,
> LAN966X_STATS_CHECK_DELAY);
> --
> 2.17.1
>
--
/Horatiu
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/2] net: microchip: sparx5: Fix potential null-ptr-deref in sparx_stats_init() and sparx5_start()
2022-11-14 13:38 [PATCH 0/2] net: microchip: Fix potential null-ptr-deref due to create_singlethread_workqueue() Shang XiaoJing
2022-11-14 13:38 ` [PATCH 1/2] net: lan966x: Fix potential null-ptr-deref in lan966x_stats_init() Shang XiaoJing
@ 2022-11-14 13:38 ` Shang XiaoJing
2022-11-16 9:20 ` [PATCH 0/2] net: microchip: Fix potential null-ptr-deref due to create_singlethread_workqueue() patchwork-bot+netdevbpf
2 siblings, 0 replies; 5+ messages in thread
From: Shang XiaoJing @ 2022-11-14 13:38 UTC (permalink / raw)
To: horatiu.vultur, UNGLinuxDriver, davem, edumazet, kuba, pabeni,
lars.povlsen, Steen.Hegelund, daniel.machon, rmk+kernel,
casper.casan, bjarni.jonasson, netdev, linux-arm-kernel
Cc: shangxiaojing
sparx_stats_init() calls create_singlethread_workqueue() and not
checked the ret value, which may return NULL. And a null-ptr-deref may
happen:
sparx_stats_init()
create_singlethread_workqueue() # failed, sparx5->stats_queue is NULL
queue_delayed_work()
queue_delayed_work_on()
__queue_delayed_work() # warning here, but continue
__queue_work() # access wq->flags, null-ptr-deref
Check the ret value and return -ENOMEM if it is NULL. So as
sparx5_start().
Fixes: af4b11022e2d ("net: sparx5: add ethtool configuration and statistics support")
Fixes: b37a1bae742f ("net: sparx5: add mactable support")
Signed-off-by: Shang XiaoJing <shangxiaojing@huawei.com>
---
drivers/net/ethernet/microchip/sparx5/sparx5_ethtool.c | 3 +++
drivers/net/ethernet/microchip/sparx5/sparx5_main.c | 3 +++
2 files changed, 6 insertions(+)
diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_ethtool.c b/drivers/net/ethernet/microchip/sparx5/sparx5_ethtool.c
index 6b0febcb7fa9..01f3a3a41cdb 100644
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_ethtool.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_ethtool.c
@@ -1253,6 +1253,9 @@ int sparx_stats_init(struct sparx5 *sparx5)
snprintf(queue_name, sizeof(queue_name), "%s-stats",
dev_name(sparx5->dev));
sparx5->stats_queue = create_singlethread_workqueue(queue_name);
+ if (!sparx5->stats_queue)
+ return -ENOMEM;
+
INIT_DELAYED_WORK(&sparx5->stats_work, sparx5_check_stats_work);
queue_delayed_work(sparx5->stats_queue, &sparx5->stats_work,
SPX5_STATS_CHECK_DELAY);
diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_main.c b/drivers/net/ethernet/microchip/sparx5/sparx5_main.c
index 62a325e96345..eeac04b84638 100644
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_main.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_main.c
@@ -659,6 +659,9 @@ static int sparx5_start(struct sparx5 *sparx5)
snprintf(queue_name, sizeof(queue_name), "%s-mact",
dev_name(sparx5->dev));
sparx5->mact_queue = create_singlethread_workqueue(queue_name);
+ if (!sparx5->mact_queue)
+ return -ENOMEM;
+
INIT_DELAYED_WORK(&sparx5->mact_work, sparx5_mact_pull_work);
queue_delayed_work(sparx5->mact_queue, &sparx5->mact_work,
SPX5_MACT_PULL_DELAY);
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 0/2] net: microchip: Fix potential null-ptr-deref due to create_singlethread_workqueue()
2022-11-14 13:38 [PATCH 0/2] net: microchip: Fix potential null-ptr-deref due to create_singlethread_workqueue() Shang XiaoJing
2022-11-14 13:38 ` [PATCH 1/2] net: lan966x: Fix potential null-ptr-deref in lan966x_stats_init() Shang XiaoJing
2022-11-14 13:38 ` [PATCH 2/2] net: microchip: sparx5: Fix potential null-ptr-deref in sparx_stats_init() and sparx5_start() Shang XiaoJing
@ 2022-11-16 9:20 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 5+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-11-16 9:20 UTC (permalink / raw)
To: Shang XiaoJing
Cc: horatiu.vultur, UNGLinuxDriver, davem, edumazet, kuba, pabeni,
lars.povlsen, Steen.Hegelund, daniel.machon, rmk+kernel,
casper.casan, bjarni.jonasson, netdev, linux-arm-kernel
Hello:
This series was applied to netdev/net.git (master)
by David S. Miller <davem@davemloft.net>:
On Mon, 14 Nov 2022 21:38:51 +0800 you wrote:
> There are some functions call create_singlethread_workqueue() without
> checking ret value, and the NULL workqueue_struct pointer may causes
> null-ptr-deref. Will be fixed by this patch.
>
> Shang XiaoJing (2):
> net: lan966x: Fix potential null-ptr-deref in lan966x_stats_init()
> net: microchip: sparx5: Fix potential null-ptr-deref in
> sparx_stats_init() and sparx5_start()
>
> [...]
Here is the summary with links:
- [1/2] net: lan966x: Fix potential null-ptr-deref in lan966x_stats_init()
https://git.kernel.org/netdev/net/c/ba86af3733ae
- [2/2] net: microchip: sparx5: Fix potential null-ptr-deref in sparx_stats_init() and sparx5_start()
https://git.kernel.org/netdev/net/c/639f5d006e36
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread