Re: [PATCH net] net/mlx5: DR, prevent potential error pointer dereference

From: Mateusz Polchlopek
Date: Tue Dec 03 2024 - 04:33:27 EST




On 11/30/2024 11:01 AM, Dan Carpenter wrote:
The dr_domain_add_vport_cap() function genereally returns NULL on error

Typo. Should be "generally"

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

Please remove unnecessary space.

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@xxxxxxxxxx>
---
.../net/ethernet/mellanox/mlx5/core/steering/sws/dr_domain.c | 2 ++
1 file changed, 2 insertions(+)

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..a379e8358f82 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,6 +297,8 @@ 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);
+ if (ret != -EBUSY)
+ return NULL;
return ERR_PTR(ret);
}


When applied those comments please add my RB tag.