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 4AFE144BCBE; Tue, 16 Jun 2026 17:24:33 +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=1781630674; cv=none; b=KzKeVpOhY8H28A8n3GDjCEKLCbTlFS9j9MFlvpi0l7+19XzkgZhpe/rme78iezMaTph5kX9RklVoLEZOzmJ/dJ2ci6aKSm0zSDUcJ/H8aY7dHtLBhP2is/h3g0iVBoaE2oxAiHgqb9OHC2ns+5rGRlASJZn/s63Oo4GHtZzbFHQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781630674; c=relaxed/simple; bh=rplYRk9SrtFo55R0HWnFk28i73jeOFNqUYERgJfZH4Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZXAkaCQej0kyW+Mb7IL6rpVNTyxlclj8FfDsyFC7e1Z5vkA47NwSBYEMwrRt+5+pfhoZfv676M5b9t2+V9CGh8l52pgTc3dz9f+2Wnp8ZPcoOmGEXI7CpzyolNJpvSzmL1X95ds9ne32peWR421M/JBYpzVZb3sTZIWtyqn92gc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=fE9qwLPb; 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="fE9qwLPb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 32F4F1F000E9; Tue, 16 Jun 2026 17:24:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781630673; bh=ADhCGIOwe0U+4EXcYWekSQVcTTf6AZKVQn40BZrCYwM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fE9qwLPbo5JRjT1FYUW10VeuSpsUdyeDZ9LMzoVKpNmwhb2+iTibdPsHjBKO5x2ya xrGvRZa1QLqjr0Y/+UyaqLowURnWzgGqxnW92VM151TDJE0IrOWH9lyYoIjY7FPJR8 NcGZJSMMy6fHoyNIVvNQHl11H22hhQlzn5VB4UpE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jiasheng Jiang , Zhu Yanjun , Leon Romanovsky , Ben Hutchings , Sasha Levin Subject: [PATCH 6.1 075/522] RDMA/rxe: Fix double free in rxe_srq_from_init Date: Tue, 16 Jun 2026 20:23:42 +0530 Message-ID: <20260616145129.353735934@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145125.307082728@linuxfoundation.org> References: <20260616145125.307082728@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 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jiasheng Jiang commit 0beefd0e15d962f497aad750b2d5e9c3570b66d1 upstream. In rxe_srq_from_init(), the queue pointer 'q' is assigned to 'srq->rq.queue' before copying the SRQ number to user space. If copy_to_user() fails, the function calls rxe_queue_cleanup() to free the queue, but leaves the now-invalid pointer in 'srq->rq.queue'. The caller of rxe_srq_from_init() (rxe_create_srq) eventually calls rxe_srq_cleanup() upon receiving the error, which triggers a second rxe_queue_cleanup() on the same memory, leading to a double free. The call trace looks like this: kmem_cache_free+0x.../0x... rxe_queue_cleanup+0x1a/0x30 [rdma_rxe] rxe_srq_cleanup+0x42/0x60 [rdma_rxe] rxe_elem_release+0x31/0x70 [rdma_rxe] rxe_create_srq+0x12b/0x1a0 [rdma_rxe] ib_create_srq_user+0x9a/0x150 [ib_core] Fix this by moving 'srq->rq.queue = q' after copy_to_user. Fixes: aae0484e15f0 ("IB/rxe: avoid srq memory leak") Signed-off-by: Jiasheng Jiang Link: https://patch.msgid.link/20260112015412.29458-1-jiashengjiangcool@gmail.com Reviewed-by: Zhu Yanjun Signed-off-by: Leon Romanovsky [bwh: Backported to 6.1: There was no assignment to init->attr.max_wr here; don't add it] Signed-off-by: Ben Hutchings Signed-off-by: Sasha Levin --- drivers/infiniband/sw/rxe/rxe_srq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/infiniband/sw/rxe/rxe_srq.c b/drivers/infiniband/sw/rxe/rxe_srq.c index 02b39498c370d2..038a9cd55413e0 100644 --- a/drivers/infiniband/sw/rxe/rxe_srq.c +++ b/drivers/infiniband/sw/rxe/rxe_srq.c @@ -69,8 +69,6 @@ int rxe_srq_from_init(struct rxe_dev *rxe, struct rxe_srq *srq, return -ENOMEM; } - srq->rq.queue = q; - err = do_mmap_info(rxe, uresp ? &uresp->mi : NULL, udata, q->buf, q->buf_size, &q->ip); if (err) { @@ -87,6 +85,8 @@ int rxe_srq_from_init(struct rxe_dev *rxe, struct rxe_srq *srq, } } + srq->rq.queue = q; + return 0; } -- 2.53.0