Linux RDMA and InfiniBand development
 help / color / mirror / Atom feed
* [PATCH] RDMA/cm: Read the remote_id_table root under cm.lock
@ 2026-11-11 19:19 Changyul Lee
  2026-11-11 20:08 ` sashiko-bot
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Changyul Lee @ 2026-11-11 19:19 UTC (permalink / raw)
  To: Jason Gunthorpe, Leon Romanovsky; +Cc: linux-rdma, linux-kernel, Changyul Lee

cm_find_remote_id() reads the root of cm.remote_id_table before it
takes cm.lock. While it waits for the lock, cm_destroy_id() or
cm_reset_to_idle() on another CPU can remove that cm_timewait_info from
the tree and free it, and the lookup then starts from freed memory.
This lookup is done for a REJ with reason IB_CM_REJ_TIMEOUT.

Read the root after taking cm.lock.

Fixes: cfa68b0d0440 ("RDMA/cm: Make find_remote_id() return a cm_id_private")
Signed-off-by: Changyul Lee <lcy8047@gmail.com>
---
Found with a static analysis tool we are developing.

Reproduced in QEMU (x86_64, KASAN) on rdma_rxe over virtio-net, with a
test module that connects to a listener on the same device through
rdma_cm and destroys each active cm_id while it is in IB_CM_REQ_SENT,
so a REJ with IB_CM_REJ_TIMEOUT is sent. Another kthread destroys the
passive cm_ids. The window was widened for the test with an msleep(20)
between reading the root and taking cm.lock. Without this patch, KASAN
reported 46 to 48 slab-use-after-free reads in cm_work_handler() per
20 second run in three runs, on a cm_timewait_info allocated by
cm_create_timewait_info() and freed by cm_destroy_id() through
cm_reset_to_idle(). With it, there was no KASAN report in three runs.

 drivers/infiniband/core/cm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index 1a2c2775b14d..5347b7519a8d 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -734,11 +734,12 @@ cm_insert_remote_id(struct cm_timewait_info *timewait_info)
 static struct cm_id_private *cm_find_remote_id(__be64 remote_ca_guid,
 					       __be32 remote_id)
 {
-	struct rb_node *node = cm.remote_id_table.rb_node;
+	struct rb_node *node;
 	struct cm_timewait_info *timewait_info;
 	struct cm_id_private *res = NULL;
 
 	spin_lock_irq(&cm.lock);
+	node = cm.remote_id_table.rb_node;
 	while (node) {
 		timewait_info = rb_entry(node, struct cm_timewait_info,
 					 remote_id_node);

base-commit: 7475ea8b58616b33c04afb976cf0fbaad9dd63fb
-- 
2.43.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] RDMA/cm: Read the remote_id_table root under cm.lock
  2026-11-11 19:19 [PATCH] RDMA/cm: Read the remote_id_table root under cm.lock Changyul Lee
@ 2026-11-11 20:08 ` sashiko-bot
  2026-11-16 11:15 ` Leon Romanovsky
  2026-11-16 11:15 ` Leon Romanovsky
  2 siblings, 0 replies; 4+ messages in thread
From: sashiko-bot @ 2026-11-11 20:08 UTC (permalink / raw)
  To: Changyul Lee; +Cc: linux-rdma

> cm_find_remote_id() reads the root of cm.remote_id_table before it
> takes cm.lock. While it waits for the lock, cm_destroy_id() or
> cm_reset_to_idle() on another CPU can remove that cm_timewait_info from
> the tree and free it, and the lookup then starts from freed memory.
> This lookup is done for a REJ with reason IB_CM_REJ_TIMEOUT.
> 
> Read the root after taking cm.lock.
> 
> Fixes: cfa68b0d0440 ("RDMA/cm: Make find_remote_id() return a cm_id_private")
> Signed-off-by: Changyul Lee <lcy8047@gmail.com>

Sashiko has reviewed this patch and found no issues.

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20261111191913.98044-1-lcy8047@gmail.com?part=1


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] RDMA/cm: Read the remote_id_table root under cm.lock
  2026-11-11 19:19 [PATCH] RDMA/cm: Read the remote_id_table root under cm.lock Changyul Lee
  2026-11-11 20:08 ` sashiko-bot
@ 2026-11-16 11:15 ` Leon Romanovsky
  2026-11-16 11:15 ` Leon Romanovsky
  2 siblings, 0 replies; 4+ messages in thread
From: Leon Romanovsky @ 2026-11-16 11:15 UTC (permalink / raw)
  To: Changyul Lee; +Cc: Jason Gunthorpe, linux-rdma, linux-kernel

On Wed, Nov 11, 2026 at 02:19:13PM -0500, Changyul Lee wrote:
> cm_find_remote_id() reads the root of cm.remote_id_table before it
> takes cm.lock. While it waits for the lock, cm_destroy_id() or
> cm_reset_to_idle() on another CPU can remove that cm_timewait_info from
> the tree and free it, and the lookup then starts from freed memory.
> This lookup is done for a REJ with reason IB_CM_REJ_TIMEOUT.
> 
> Read the root after taking cm.lock.
> 
> Fixes: cfa68b0d0440 ("RDMA/cm: Make find_remote_id() return a cm_id_private")
> Signed-off-by: Changyul Lee <lcy8047@gmail.com>
> ---
> Found with a static analysis tool we are developing.
> 
> Reproduced in QEMU (x86_64, KASAN) on rdma_rxe over virtio-net, with a
> test module that connects to a listener on the same device through
> rdma_cm and destroys each active cm_id while it is in IB_CM_REQ_SENT,
> so a REJ with IB_CM_REJ_TIMEOUT is sent. Another kthread destroys the
> passive cm_ids. The window was widened for the test with an msleep(20)
> between reading the root and taking cm.lock. Without this patch, KASAN
> reported 46 to 48 slab-use-after-free reads in cm_work_handler() per
> 20 second run in three runs, on a cm_timewait_info allocated by
> cm_create_timewait_info() and freed by cm_destroy_id() through
> cm_reset_to_idle(). With it, there was no KASAN report in three runs.

I'll take this patch, since it's simple enough. However, using a test module
that misuses an in-kernel API is not the right approach.

Thanks

> 
>  drivers/infiniband/core/cm.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
> index 1a2c2775b14d..5347b7519a8d 100644
> --- a/drivers/infiniband/core/cm.c
> +++ b/drivers/infiniband/core/cm.c
> @@ -734,11 +734,12 @@ cm_insert_remote_id(struct cm_timewait_info *timewait_info)
>  static struct cm_id_private *cm_find_remote_id(__be64 remote_ca_guid,
>  					       __be32 remote_id)
>  {
> -	struct rb_node *node = cm.remote_id_table.rb_node;
> +	struct rb_node *node;
>  	struct cm_timewait_info *timewait_info;
>  	struct cm_id_private *res = NULL;
>  
>  	spin_lock_irq(&cm.lock);
> +	node = cm.remote_id_table.rb_node;
>  	while (node) {
>  		timewait_info = rb_entry(node, struct cm_timewait_info,
>  					 remote_id_node);
> 
> base-commit: 7475ea8b58616b33c04afb976cf0fbaad9dd63fb
> -- 
> 2.43.0
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] RDMA/cm: Read the remote_id_table root under cm.lock
  2026-11-11 19:19 [PATCH] RDMA/cm: Read the remote_id_table root under cm.lock Changyul Lee
  2026-11-11 20:08 ` sashiko-bot
  2026-11-16 11:15 ` Leon Romanovsky
@ 2026-11-16 11:15 ` Leon Romanovsky
  2 siblings, 0 replies; 4+ messages in thread
From: Leon Romanovsky @ 2026-11-16 11:15 UTC (permalink / raw)
  To: Jason Gunthorpe, Changyul Lee; +Cc: linux-rdma, linux-kernel


On Wed, 11 Nov 2026 14:19:13 -0500, Changyul Lee wrote:
> cm_find_remote_id() reads the root of cm.remote_id_table before it
> takes cm.lock. While it waits for the lock, cm_destroy_id() or
> cm_reset_to_idle() on another CPU can remove that cm_timewait_info from
> the tree and free it, and the lookup then starts from freed memory.
> This lookup is done for a REJ with reason IB_CM_REJ_TIMEOUT.
> 
> Read the root after taking cm.lock.
> 
> [...]

Applied, thanks!

[1/1] RDMA/cm: Read the remote_id_table root under cm.lock
      https://git.kernel.org/rdma/rdma/c/a6b0e712b0fccc

Best regards,
-- 
Leon Romanovsky <leon@kernel.org>


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2026-11-16 11:15 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-11 19:19 [PATCH] RDMA/cm: Read the remote_id_table root under cm.lock Changyul Lee
2026-11-11 20:08 ` sashiko-bot
2026-11-16 11:15 ` Leon Romanovsky
2026-11-16 11:15 ` Leon Romanovsky

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox