From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 64B071F8688; Tue, 17 Dec 2024 17:16:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734455799; cv=none; b=OYkBdMbQqr2IOGrccx6dEhpYjPZTXQiD0OO+pNA/aYdPKbzAVtGNbTYOhtMEaShxxK2zKOu9C02pKwG8E2rVJpCv2BIcyU3DwGM96uBh+fisayxv3Y6C8rq/OqRo7aR6PUscce8AsP0iNX7mBYczh9N+uuYYLsmrjfCdlB+Mqw8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734455799; c=relaxed/simple; bh=irvoz/QY1ACwgb1Nv/2o37VN42VE2hGB+3z1LaJCfUI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CA6dGRIahdFsj5Sz/S4xBeLyJOBqGd6IvS4u7Q1Xz1hbcxQU+EOx13CdmeQ9NA8X2W+EnpFMnIsDtYVzsUiw73naM8hwIT13GWwBLXHwlA1cKqllHQ0L/F4f0qplSbEqFekEqtJNovzXj9D2PRUUFGt7453BjDVKKaaUf62Hjbw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=HuaAkonu; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="HuaAkonu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E17A2C4CED7; Tue, 17 Dec 2024 17:16:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734455799; bh=irvoz/QY1ACwgb1Nv/2o37VN42VE2hGB+3z1LaJCfUI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HuaAkonuphdFBRg5mZylxctMGOf4yENuDf+qwybuqgUU79BP2AC7vk67H5ZnLPDJm /BQqfq6UBWk+xqbn9tOXCO1JTtJIF7+EaZJbn1IFHslmAIUpTKrhaZtkwwPnyhvfgL 5tCEqdPHQjJcTOpnbgTnjf+Zq3LnAAojGl9XHe7U= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dan Carpenter , Tariq Toukan , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.1 36/76] net/mlx5: DR, prevent potential error pointer dereference Date: Tue, 17 Dec 2024 18:07:16 +0100 Message-ID: <20241217170527.760465572@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241217170526.232803729@linuxfoundation.org> References: <20241217170526.232803729@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dan Carpenter [ 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 Reviewed-by: Tariq Toukan Link: https://patch.msgid.link/07477254-e179-43e2-b1b3-3b9db4674195@stanley.mountain Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- 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 fc6ae49b5ecc..d462017c6a95 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_domain.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_domain.c @@ -195,7 +195,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