* [PATCH v3 net] net/mlx5: DR, prevent potential error pointer dereference
@ 2024-12-04 12:06 Dan Carpenter
2024-12-04 12:53 ` Tariq Toukan
2024-12-06 7:10 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 3+ messages in thread
From: Dan Carpenter @ 2024-12-04 12:06 UTC (permalink / raw)
To: Yevgeny Kliteynik
Cc: Saeed Mahameed, Leon Romanovsky, Tariq Toukan, Andrew Lunn,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Muhammad Sammar, netdev, linux-rdma, linux-kernel,
kernel-janitors
The dr_domain_add_vport_cap() function generally returns NULL on error
but sometimes we want it to return ERR_PTR(-EBUSY) so the caller can
retry. The problem here is that "ret" can be either -EBUSY or -ENOMEM
and if it's and -ENOMEM then the error pointer is propogated back and
eventually dereferenced in dr_ste_v0_build_src_gvmi_qpn_tag().
Fixes: 11a45def2e19 ("net/mlx5: DR, Add support for SF vports")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
v2: fix typo in commit message
v3: better style
.../net/ethernet/mellanox/mlx5/core/steering/sws/dr_domain.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_domain.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_domain.c
index 3d74109f8230..49f22cad92bf 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_domain.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_domain.c
@@ -297,7 +297,9 @@ dr_domain_add_vport_cap(struct mlx5dr_domain *dmn, u16 vport)
if (ret) {
mlx5dr_dbg(dmn, "Couldn't insert new vport into xarray (%d)\n", ret);
kvfree(vport_caps);
- return ERR_PTR(ret);
+ if (ret == -EBUSY)
+ return ERR_PTR(-EBUSY);
+ return NULL;
}
return vport_caps;
--
2.45.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v3 net] net/mlx5: DR, prevent potential error pointer dereference
2024-12-04 12:06 [PATCH v3 net] net/mlx5: DR, prevent potential error pointer dereference Dan Carpenter
@ 2024-12-04 12:53 ` Tariq Toukan
2024-12-06 7:10 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: Tariq Toukan @ 2024-12-04 12:53 UTC (permalink / raw)
To: Dan Carpenter, Yevgeny Kliteynik
Cc: Saeed Mahameed, Leon Romanovsky, Tariq Toukan, Andrew Lunn,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Muhammad Sammar, netdev, linux-rdma, linux-kernel,
kernel-janitors
On 04/12/2024 14:06, Dan Carpenter wrote:
> The dr_domain_add_vport_cap() function generally returns NULL on error
> but sometimes we want it to return ERR_PTR(-EBUSY) so the caller can
> retry. The problem here is that "ret" can be either -EBUSY or -ENOMEM
> and if it's and -ENOMEM then the error pointer is propogated back and
> eventually dereferenced in dr_ste_v0_build_src_gvmi_qpn_tag().
>
> Fixes: 11a45def2e19 ("net/mlx5: DR, Add support for SF vports")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
> ---
> v2: fix typo in commit message
> v3: better style
>
> .../net/ethernet/mellanox/mlx5/core/steering/sws/dr_domain.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_domain.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_domain.c
> index 3d74109f8230..49f22cad92bf 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_domain.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_domain.c
> @@ -297,7 +297,9 @@ dr_domain_add_vport_cap(struct mlx5dr_domain *dmn, u16 vport)
> if (ret) {
> mlx5dr_dbg(dmn, "Couldn't insert new vport into xarray (%d)\n", ret);
> kvfree(vport_caps);
> - return ERR_PTR(ret);
> + if (ret == -EBUSY)
> + return ERR_PTR(-EBUSY);
> + return NULL;
> }
>
> return vport_caps;
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v3 net] net/mlx5: DR, prevent potential error pointer dereference
2024-12-04 12:06 [PATCH v3 net] net/mlx5: DR, prevent potential error pointer dereference Dan Carpenter
2024-12-04 12:53 ` Tariq Toukan
@ 2024-12-06 7:10 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2024-12-06 7:10 UTC (permalink / raw)
To: Dan Carpenter
Cc: kliteyn, saeedm, leon, tariqt, andrew+netdev, davem, edumazet,
kuba, pabeni, muhammads, netdev, linux-rdma, linux-kernel,
kernel-janitors
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:
On Wed, 4 Dec 2024 15:06:41 +0300 you wrote:
> The dr_domain_add_vport_cap() function generally returns NULL on error
> but sometimes we want it to return ERR_PTR(-EBUSY) so the caller can
> retry. The problem here is that "ret" can be either -EBUSY or -ENOMEM
> and if it's and -ENOMEM then the error pointer is propogated back and
> eventually dereferenced in dr_ste_v0_build_src_gvmi_qpn_tag().
>
> Fixes: 11a45def2e19 ("net/mlx5: DR, Add support for SF vports")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
>
> [...]
Here is the summary with links:
- [v3,net] net/mlx5: DR, prevent potential error pointer dereference
https://git.kernel.org/netdev/net/c/11776cff0b56
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-12-06 7:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-04 12:06 [PATCH v3 net] net/mlx5: DR, prevent potential error pointer dereference Dan Carpenter
2024-12-04 12:53 ` Tariq Toukan
2024-12-06 7:10 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox