| From e693a60895d2580e8e35e7a638c2bc0acf68eb91 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 4 Dec 2024 15:06:41 +0300 |
| Subject: net/mlx5: DR, prevent potential error pointer dereference |
| |
| From: Dan Carpenter <dan.carpenter@linaro.org> |
| |
| [ Upstream commit 11776cff0b563c8b8a4fa76cab620bfb633a8cb8 ] |
| |
| 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> |
| Reviewed-by: Tariq Toukan <tariqt@nvidia.com> |
| Link: https://patch.msgid.link/07477254-e179-43e2-b1b3-3b9db4674195@stanley.mountain |
| Signed-off-by: Jakub Kicinski <kuba@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/mellanox/mlx5/core/steering/dr_domain.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_domain.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_domain.c |
| index 3d74109f8230..49f22cad92bf 100644 |
| --- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_domain.c |
| +++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/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.39.5 |
| |
