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 F072842F71D; Tue, 21 Jul 2026 19:30:40 +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=1784662242; cv=none; b=hggn56NqmC95SPylmU+AVheMkNtkV9bNVh+TSrIG60Sfk/6bTS/mTh6AD3l7JkWToEF64lt9KYqWxTxxQ5WI+2Qmt9dUIpDYE4Y2beK1B9biiRLWtMAB3IHEv5IaSaZh9klBwh3ZBlF6ou8PGV25SSdWTUByiH6MAL0wdP03JbQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784662242; c=relaxed/simple; bh=qyWGG3TTBE5XrkcIhK6eJesUY6EtYnckcWquOonz6bA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZxoNAcmGADaO4sWm8cY3gC7EtAINdZB/yzTqvQO9cvXDoOJzbOv4q3EmNkCtfHBkpRIWyIMzsQ4Ub2o9QFM/SBdgJxh8QqU1+SKo5ZrDd+1yGdPzdeiY09AACD9nGaQ4m9Tm0LX62RvMcBIAX/KM3Wf35cHjLoSGoAO9N+eUYjM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=nUTbyINw; 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="nUTbyINw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 898361F000E9; Tue, 21 Jul 2026 19:30:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784662240; bh=HpibtfE4tmf50YtG5qOX3WYoeP2t+7C86UXVMLUaYTU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=nUTbyINwYuai4CiU9MnPM5fDVbj3oWnbMSdErbVaq7unfA8MzivcALSXnxR+4ZaBA ZjoUHMDuWLn5nmF0O4Mi3QtyboIRSd3kFE77UI4QN9Xqqs/uNOu6NTXpEqDwqaypnU 5t9udzvSo8tqemcACetKlsKWk6aaaoSjsENXXK50= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Maher Sanalla , Edward Srouji , Jason Gunthorpe , Sasha Levin Subject: [PATCH 6.12 0327/1276] RDMA/mlx5: Fix undefined shift of user RQ WQE size Date: Tue, 21 Jul 2026 17:12:50 +0200 Message-ID: <20260721152453.412902972@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152446.065700225@linuxfoundation.org> References: <20260721152446.065700225@linuxfoundation.org> User-Agent: quilt/0.69 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.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Maher Sanalla [ Upstream commit d881d60223aac8fdc12b227d89c76e131e92a9cd ] set_rq_size() computes the RQ WQE size as "1 << rq_wqe_shift" based on the user-provided rq_wqe_shift, which is only checked to be greater than 32, so shifts of 32 are still accepted. A shift of 31 also overflows a signed integer, leading to undefined behavior. Use check_shl_overflow() to compute the RQ WQE size and reject any invalid values. Fixes: e126ba97dba9 ("mlx5: Add driver for Mellanox Connect-IB adapters") Link: https://patch.msgid.link/r/20260611-maher-sec-fixes-v1-1-cd8eb2542869@nvidia.com Signed-off-by: Maher Sanalla Signed-off-by: Edward Srouji Signed-off-by: Jason Gunthorpe Signed-off-by: Sasha Levin --- drivers/infiniband/hw/mlx5/qp.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c index ba704c723c6e4f..badec2e3397299 100644 --- a/drivers/infiniband/hw/mlx5/qp.c +++ b/drivers/infiniband/hw/mlx5/qp.c @@ -451,16 +451,13 @@ static int set_rq_size(struct mlx5_ib_dev *dev, struct ib_qp_cap *cap, if (ucmd) { qp->rq.wqe_cnt = ucmd->rq_wqe_count; - if (ucmd->rq_wqe_shift > BITS_PER_BYTE * sizeof(ucmd->rq_wqe_shift)) - return -EINVAL; qp->rq.wqe_shift = ucmd->rq_wqe_shift; - if ((1 << qp->rq.wqe_shift) / - sizeof(struct mlx5_wqe_data_seg) < - wq_sig) + if (check_shl_overflow(1, qp->rq.wqe_shift, &wqe_size)) + return -EINVAL; + if (wqe_size / sizeof(struct mlx5_wqe_data_seg) < wq_sig) return -EINVAL; qp->rq.max_gs = - (1 << qp->rq.wqe_shift) / - sizeof(struct mlx5_wqe_data_seg) - + wqe_size / sizeof(struct mlx5_wqe_data_seg) - wq_sig; qp->rq.max_post = qp->rq.wqe_cnt; } else { -- 2.53.0