From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 3BE7244BC94; Tue, 16 Jun 2026 15:36:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781624179; cv=none; b=b/m1xMX5bVnmQRZO8AMx3aarB4Z1W+SsrEmABDD1ShbcGgpdlRbaP4Fj89ObcRT5zRiq6RLa8IZ74kQGtXejqHyRBixJlA2vDvs4tFtOwBmOHQbuOXc9BdLv0xkxebwPcFPfhOh7M247U/P+1r6zZjDXV1xzaBJjC3BDp00Q77I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781624179; c=relaxed/simple; bh=1HEA38jiHmVf61Y5ZYqTobdgadR1AvG0nv2W5OvmK1A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Bbst0M7CWFP/hkgSTQRVmP8QHUQ0WKmQhdh0NfSaKOZIK/NQKmvNa8ZKDE9LIWN2gxQnUrJLxILKu36/Vd7gAkQjLIqKjIzhCUACbnxWM88cZigeWRKXu62Vy2opIb9T/H6RwBjPiPIeGrX/mKiVBLgDMj+C4/5OzpHWTp4yV2o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=rq6xhg/i; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="rq6xhg/i" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3BB091F00A3A; Tue, 16 Jun 2026 15:36:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781624178; bh=wuA1DJnohwpvH7KvAEZm79A/U2htlyQwPtFkrSdsyhg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=rq6xhg/il4xf9kZEGm+gokO+bgj6R+e8kaEIEr1+rtfniLcwcPbzbgQIcnWTJZ0dL x25MwjCH1rwmhMuNydTbl+YpNNL4fJV2L2HgSPswap4j0coNiSauiudyCFtrgrmwzF qcJ2yPspuaFHnFAqhnvnE5MjNCaG8SRwlk1JpuCk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Nikolay Kuratov , Md Haris Iqbal , Moshe Shemesh , Tariq Toukan , Paolo Abeni Subject: [PATCH 7.0 287/378] net/mlx5: Reorder completion before putting command entry in cmd_work_handler Date: Tue, 16 Jun 2026 20:28:38 +0530 Message-ID: <20260616145125.191787418@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145109.744539446@linuxfoundation.org> References: <20260616145109.744539446@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 7.0-stable review patch. If anyone has any objections, please let me know. ------------------ From: Nikolay Kuratov commit 02896a7fa4cd3ec61d60ba30136841e4f04bdeac upstream. Assuming callback != NULL && !page_queue, cmd_work_handler takes command entry with refcnt == 1 from mlx5_cmd_invoke. If either semaphore timeout or index allocation error happens, it does final cmd_ent_put(ent). To avoid access to freed memory, notify slotted completion before cmd_ent_put. This is theoretical issue found by Svace static analyser. Cc: stable@vger.kernel.org Fixes: 485d65e135712 ("net/mlx5: Add a timeout to acquire the command queue semaphore") Fixes: 0e2909c6bec90 ("net/mlx5: Fix variable not being completed when function returns") Signed-off-by: Nikolay Kuratov Reviewed-by: Md Haris Iqbal Reviewed-by: Moshe Shemesh Acked-by: Tariq Toukan Link: https://patch.msgid.link/20260526162932.501584-1-kniv@yandex-team.ru Signed-off-by: Paolo Abeni Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c @@ -1001,12 +1001,13 @@ static void cmd_work_handler(struct work ent->callback(-EBUSY, ent->context); mlx5_free_cmd_msg(dev, ent->out); free_msg(dev, ent->in); + complete(&ent->slotted); cmd_ent_put(ent); } else { ent->ret = -EBUSY; complete(&ent->done); + complete(&ent->slotted); } - complete(&ent->slotted); return; } alloc_ret = cmd_alloc_index(cmd, ent); @@ -1016,13 +1017,14 @@ static void cmd_work_handler(struct work ent->callback(-EAGAIN, ent->context); mlx5_free_cmd_msg(dev, ent->out); free_msg(dev, ent->in); + complete(&ent->slotted); cmd_ent_put(ent); } else { ent->ret = -EAGAIN; complete(&ent->done); + complete(&ent->slotted); } up(&cmd->vars.sem); - complete(&ent->slotted); return; } } else {