Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net/mlx5: DR, prevent potential error pointer dereference

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>

authored by

Dan Carpenter and committed by
Jakub Kicinski
11776cff b04d86ff

+3 -1
+3 -1
drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_domain.c
··· 297 297 if (ret) { 298 298 mlx5dr_dbg(dmn, "Couldn't insert new vport into xarray (%d)\n", ret); 299 299 kvfree(vport_caps); 300 - return ERR_PTR(ret); 300 + if (ret == -EBUSY) 301 + return ERR_PTR(-EBUSY); 302 + return NULL; 301 303 } 302 304 303 305 return vport_caps;