From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3A32FEEB3 for ; Mon, 22 Jun 2026 23:21:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782170501; cv=none; b=UR/DYkFmj7RfxcbfAJhCH5bxAOTI61rqAEiDRmgz/Ng/j0CJBEFSNK9WuJ4uSGaOdGfPKc66mMmVM8rUYiGuh+NlEhImWXTwj9NgSrVxDZwhjgwPAltPRRpwJcUPFGgwvKtPPaV+2P9YWIimNzQ2JRpj8g7YgT2j/rYfKXljkkA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782170501; c=relaxed/simple; bh=ayCy3cGVEu00i48Vobfal0jonPkvwBJ9M8mK5Qd/tvk=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=tPfw0SMvEcmRMy1YvKL2nw9FFQo9ZT1PCGXsOVpXDaKcmCOm2OhutkvzdUqnrFUwRvJc6OWFxC75K7MYZHb5NhiO236MAHg3vX4TDPFU4rKGD3hJIkO6emfTV311oAPSlG/7b5my8fl6eSylaQZ2bDTN/D7bsHMbumIxtMeBkh8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=s2GnG7RP; arc=none smtp.client-ip=209.85.216.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="s2GnG7RP" Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-36bdda53d99so2024430a91.0 for ; Mon, 22 Jun 2026 16:21:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782170499; x=1782775299; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=FVvqZd1j8YtnpQjRt0ICLMC2FHwDcrXUGAgeGVOlmhI=; b=s2GnG7RPiA4EscbG04CQ73HjFRXZKAzWg1/lGe388XYfShaUMK2WDCMWKE+D4kLIM3 UlMJZxuZS2cxg+BPPcu8ai5tEfGIZp+AIY+mVHxzDO4/pRawxh9ipxc5TPmKi8iLQ04f KfV5LPOArL1htsamgcMA5qpSQleGDKZGfFloBD9AbF71b10fluY9NebPicN2kCjnql3L Ww4zBcLPeImvNZZ9HVgXoYN3expwxFMUHb45wwFFKBH4hCKGbdcZwHp10HR9RyPeQoSD 219XDDbRmLja2Ewa4vKTRAMIRba97jyCnjIruyjw2sunJ9A609A5+p+lLbmFrwZ6zCcJ Iw3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782170499; x=1782775299; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=FVvqZd1j8YtnpQjRt0ICLMC2FHwDcrXUGAgeGVOlmhI=; b=gcWS0fINyPSTLHKO1vOQQJlP1ouRKEV8wxIxRk0DTnn4hAf06ltK1+FT+8a63JFOlI LbamC59k1JLte6dhwc0c9Harx90BTSlx1mT0HjbL5NXFGZdnct+oKzLBf3xXAlNhM5z5 IZMPQtXVmgf2V3++KImQSjMEy7gncfduEbvH8MtGpc9e5PAIrzR0G8a7EtzEty+Tc0Sq JO9TXVR6pxKy9Gz2edp3OMIN/OsJDmCQfe2S5PwTNLFNe0Ayn+cDxKxTJuWwPZ5eEqO6 B4Zwihx4UgaisdtuNyVSuTk4CZAcq3+vLPN/j4ukvhBGbg91oz8mNoQfq6VlhMooNxwN cfAg== X-Forwarded-Encrypted: i=1; AHgh+RqkQddEplKujWdX2T+3rqPGQhH6DLJzBk+lUvj6VY6wjpNbSsqWGl7j3wufJTLZteqQZNP6IJq7F0YX6Es=@vger.kernel.org X-Gm-Message-State: AOJu0YyEIlBmQ6b02Z9EPdHC+qslHDL6GgGxvIY4WoVV3q0nRzvB/rdn 76Rkf2VThrgBhnJWz6PZ5D2Ku3DlK8MzoBIrm5ImIwnzYcJ0f1INLgzq X-Gm-Gg: AfdE7cnBjzlPx9dxtYtVPr4CS7AKj1mdE1QXY3mhQLNpKqWHIxY4k0xQLxWK8CcmiBd v4IXLxS322zvQanb5i5+dte8PCmPnxtwZFjpIrxyt+3Z/ghHTeYLKZs74beQcHLNj+20/3XXHe3 up5VDbX/6nIAUoTzvmmXkJ7cGBbV6R0ojEF1dKQ01TeCi9w6VnzZSkMmXIHkv3R8WwTCHwFeBNu NkY3ASTco6UOkI+WTPkyfBua/R6W+iDrGvFwQcD9CON8TvDfEmtJadT2bnc8cHTn01NB2vZTtmB hphYs/kIIYwaab07PvwkAqDh59ZWV/RiwRnyNZTM12/EpTMPoYlL5qS+WsP8xJxnStUTvJVa9/w ypFFdTUNIvZEvYfeHfrpkQtpy63f/eYKjfocSUc0U1H7lX7Yc2EpvbU1P36odvwIPNA4jfocVzQ jQ/0DDjE4= X-Received: by 2002:a17:90b:388e:b0:368:3d3e:efa6 with SMTP id 98e67ed59e1d1-37d4e64ce30mr11915896a91.20.1782170499295; Mon, 22 Jun 2026 16:21:39 -0700 (PDT) Received: from localhost ([111.228.63.84]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-37d155804acsm10921376a91.6.2026.06.22.16.21.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2026 16:21:38 -0700 (PDT) From: Cen Zhang To: Keith Busch , Jens Axboe , Christoph Hellwig , Sagi Grimberg , Steve Wise Cc: linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, baijiaju1990@gmail.com, zzzccc427@gmail.com Subject: [PATCH v2] nvme-rdma: pin device wrapper in remove_one Date: Tue, 23 Jun 2026 07:21:31 +0800 Message-Id: <20260622232131.3718076-1-zzzccc427@gmail.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit nvme_rdma_remove_one() first verifies that an ib_device has an nvme_rdma_device on device_list, but it drops device_list_mutex before it walks nvme_rdma_ctrl_list. It then identifies matching controllers by dereferencing ctrl->device->dev while holding only nvme_rdma_ctrl_mutex. ctrl->device is a cached copy of queue 0's nvme_rdma_device. Queue teardown owns that wrapper's kref, so controller list membership does not keep the wrapper alive. The buggy scenario involves two paths, with each column showing the order within that path: RDMA remove callback: Controller error recovery: 1. find ndev on device_list 1. run nvme_rdma_error_recovery_work() 2. drop device_list_mutex 2. tear down the admin queue 3. walk nvme_rdma_ctrl_list 3. drop the final queue device ref 4. read ctrl->device->dev 4. free the nvme_rdma_device wrapper Fix this by taking a temporary reference to the matching nvme_rdma_device while still holding device_list_mutex. The controller walk can then compare ctrl->device directly with the pinned wrapper without dereferencing a queue-owned object that might have been freed. Release the temporary reference after the optional delete workqueue flush. Validation reproduced this kernel report: BUG: KASAN: slab-use-after-free in nvme_rdma_remove_one+0x281/0x2c0 [nvme_rdma] Call Trace: dump_stack_lvl+0x66/0xa0 print_report+0xce/0x630 ? nvme_rdma_remove_one+0x281/0x2c0 [nvme_rdma] ? srso_alias_return_thunk+0x5/0xfbef5 ? __virt_addr_valid+0x20d/0x410 ? nvme_rdma_remove_one+0x281/0x2c0 [nvme_rdma] kasan_report+0xe0/0x110 ? nvme_rdma_remove_one+0x281/0x2c0 [nvme_rdma] nvme_rdma_remove_one+0x281/0x2c0 [nvme_rdma] remove_client_context+0xa9/0xf0 [ib_core] disable_device+0x12d/0x240 [ib_core] ? __pfx_disable_device+0x10/0x10 [ib_core] ? srso_alias_return_thunk+0x5/0xfbef5 ? __mutex_unlock_slowpath+0x147/0x900 __ib_unregister_device+0x26f/0x460 [ib_core] ib_unregister_device_and_put+0x55/0x70 [ib_core] nldev_dellink+0x29e/0x3c0 [ib_core] ? unwind_next_frame+0x6e3/0x2190 ? __pfx_nldev_dellink+0x10/0x10 [ib_core] ? lock_acquire+0x2b8/0x2f0 ? srso_alias_return_thunk+0x5/0xfbef5 ? cap_capable+0x196/0x330 ? __pfx_down_read+0x10/0x10 rdma_nl_rcv_msg+0x2db/0x5f0 [ib_core] ? __pfx_rdma_nl_rcv_msg+0x10/0x10 [ib_core] rdma_nl_rcv_skb.constprop.0.isra.0+0x222/0x380 [ib_core] ? __pfx_rdma_nl_rcv_skb.constprop.0.isra.0+0x10/0x10 [ib_core] ? srso_alias_return_thunk+0x5/0xfbef5 ? srso_alias_return_thunk+0x5/0xfbef5 ? netlink_deliver_tap+0x150/0xac0 netlink_unicast+0x47c/0x790 ? __pfx_netlink_unicast+0x10/0x10 netlink_sendmsg+0x767/0xc30 ? __pfx_netlink_sendmsg+0x10/0x10 ? lock_release+0x1e0/0x280 __sys_sendto+0x339/0x390 ? __pfx___sys_sendto+0x10/0x10 ? srso_alias_return_thunk+0x5/0xfbef5 __x64_sys_sendto+0xe0/0x1c0 ? do_syscall_64+0x81/0x6a0 ? srso_alias_return_thunk+0x5/0xfbef5 ? trace_hardirqs_on+0x18/0x160 do_syscall_64+0x115/0x6a0 entry_SYSCALL_64_after_hwframe+0x77/0x7f Allocated by task 436: kasan_save_stack+0x33/0x60 kasan_save_track+0x14/0x30 __kasan_kmalloc+0xaa/0xb0 nvme_rdma_cm_handler+0xcbc/0x2914 [nvme_rdma] cma_cm_event_handler+0xb2/0x390 [rdma_cm] addr_handler+0x199/0x2b0 [rdma_cm] process_one_req+0x113/0x650 [ib_core] process_one_work+0x8d0/0x1870 worker_thread+0x575/0xf80 kthread+0x2e7/0x3c0 ret_from_fork+0x576/0x810 ret_from_fork_asm+0x1a/0x30 Freed by task 436: kasan_save_stack+0x33/0x60 kasan_save_track+0x14/0x30 kasan_save_free_info+0x3b/0x60 __kasan_slab_free+0x5f/0x80 kfree+0x307/0x580 nvme_rdma_free_dev+0x16d/0x260 [nvme_rdma] nvme_rdma_free_queue+0x6d/0x90 [nvme_rdma] nvme_rdma_error_recovery_work+0x7f/0x110 [nvme_rdma] process_one_work+0x8d0/0x1870 worker_thread+0x575/0xf80 kthread+0x2e7/0x3c0 ret_from_fork+0x576/0x810 ret_from_fork_asm+0x1a/0x30 Fixes: e87a911fed07 ("nvme-rdma: use ib_client API to detect device removal") Assisted-by: Codex:gpt-5.5 Signed-off-by: Cen Zhang --- v2: Reworked the fix to take a temporary nvme_rdma_device reference during the device_list lookup instead of adding a cached ib_device field to struct nvme_rdma_ctrl. Changed the controller-list match to compare ctrl->device against the pinned wrapper while preserving the existing delete workqueue flush behavior. drivers/nvme/host/rdma.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c index 6909e3542794..9efe84b9d1d5 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@ -2372,31 +2372,32 @@ static struct nvmf_transport_ops nvme_rdma_transport = { static void nvme_rdma_remove_one(struct ib_device *ib_device, void *client_data) { struct nvme_rdma_ctrl *ctrl; - struct nvme_rdma_device *ndev; - bool found = false; + struct nvme_rdma_device *ndev = NULL; + struct nvme_rdma_device *tmp; mutex_lock(&device_list_mutex); - list_for_each_entry(ndev, &device_list, entry) { - if (ndev->dev == ib_device) { - found = true; + list_for_each_entry(tmp, &device_list, entry) { + if (tmp->dev == ib_device && nvme_rdma_dev_get(tmp)) { + ndev = tmp; break; } } mutex_unlock(&device_list_mutex); - if (!found) + if (!ndev) return; /* Delete all controllers using this device */ mutex_lock(&nvme_rdma_ctrl_mutex); list_for_each_entry(ctrl, &nvme_rdma_ctrl_list, list) { - if (ctrl->device->dev != ib_device) + if (ctrl->device != ndev) continue; nvme_delete_ctrl(&ctrl->ctrl); } mutex_unlock(&nvme_rdma_ctrl_mutex); flush_workqueue(nvme_delete_wq); + nvme_rdma_dev_put(ndev); } static struct ib_client nvme_rdma_ib_client = { -- 2.43.0