Skip to content

Commit edfb65d

Browse files
PatrisiousHaddadgregkh
authored andcommitted
RDMA/mlx5: Fix implicit ODP use after free
commit d3d9304 upstream. Prevent double queueing of implicit ODP mr destroy work by using __xa_cmpxchg() to make sure this is the only time we are destroying this specific mr. Without this change, we could try to invalidate this mr twice, which in turn could result in queuing a MR work destroy twice, and eventually the second work could execute after the MR was freed due to the first work, causing a user after free and trace below. refcount_t: underflow; use-after-free. WARNING: CPU: 2 PID: 12178 at lib/refcount.c:28 refcount_warn_saturate+0x12b/0x130 Modules linked in: bonding ib_ipoib vfio_pci ip_gre geneve nf_tables ip6_gre gre ip6_tunnel tunnel6 ipip tunnel4 ib_umad rdma_ucm mlx5_vfio_pci vfio_pci_core vfio_iommu_type1 mlx5_ib vfio ib_uverbs mlx5_core iptable_raw openvswitch nsh rpcrdma ib_iser libiscsi scsi_transport_iscsi rdma_cm iw_cm ib_cm ib_core xt_conntrack xt_MASQUERADE nf_conntrack_netlink nfnetlink xt_addrtype iptable_nat nf_nat br_netfilter rpcsec_gss_krb5 auth_rpcgss oid_registry overlay zram zsmalloc fuse [last unloaded: ib_uverbs] CPU: 2 PID: 12178 Comm: kworker/u20:5 Not tainted 6.5.0-rc1_net_next_mlx5_58c644e #1 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.13.0-0-gf21b5a4aeb02-prebuilt.qemu.org 04/01/2014 Workqueue: events_unbound free_implicit_child_mr_work [mlx5_ib] RIP: 0010:refcount_warn_saturate+0x12b/0x130 Code: 48 c7 c7 38 95 2a 82 c6 05 bc c6 fe 00 01 e8 0c 66 aa ff 0f 0b 5b c3 48 c7 c7 e0 94 2a 82 c6 05 a7 c6 fe 00 01 e8 f5 65 aa ff <0f> 0b 5b c3 90 8b 07 3d 00 00 00 c0 74 12 83 f8 01 74 13 8d 50 ff RSP: 0018:ffff8881008e3e40 EFLAGS: 00010286 RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000027 RDX: ffff88852c91b5c8 RSI: 0000000000000001 RDI: ffff88852c91b5c0 RBP: ffff8881dacd4e00 R08: 00000000ffffffff R09: 0000000000000019 R10: 000000000000072e R11: 0000000063666572 R12: ffff88812bfd9e00 R13: ffff8881c792d200 R14: ffff88810011c005 R15: ffff8881002099c0 FS: 0000000000000000(0000) GS:ffff88852c900000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f5694b5e000 CR3: 00000001153f6003 CR4: 0000000000370ea0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> ? refcount_warn_saturate+0x12b/0x130 free_implicit_child_mr_work+0x180/0x1b0 [mlx5_ib] process_one_work+0x1cc/0x3c0 worker_thread+0x218/0x3c0 kthread+0xc6/0xf0 ret_from_fork+0x1f/0x30 </TASK> Fixes: 5256edc ("RDMA/mlx5: Rework implicit ODP destroy") Cc: [email protected] Link: https://patch.msgid.link/r/c96b8645a81085abff739e6b06e286a350d1283d.1737274283.git.leon@kernel.org Signed-off-by: Patrisious Haddad <[email protected]> Signed-off-by: Leon Romanovsky <[email protected]> Signed-off-by: Jason Gunthorpe <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent be2c5f7 commit edfb65d

File tree

1 file changed

+22
-8
lines changed
  • drivers/infiniband/hw/mlx5

1 file changed

+22
-8
lines changed

drivers/infiniband/hw/mlx5/odp.c

+22-8
Original file line numberDiff line numberDiff line change
@@ -228,13 +228,27 @@ static void destroy_unused_implicit_child_mr(struct mlx5_ib_mr *mr)
228228
unsigned long idx = ib_umem_start(odp) >> MLX5_IMR_MTT_SHIFT;
229229
struct mlx5_ib_mr *imr = mr->parent;
230230

231+
/*
232+
* If userspace is racing freeing the parent implicit ODP MR then we can
233+
* loose the race with parent destruction. In this case
234+
* mlx5_ib_free_odp_mr() will free everything in the implicit_children
235+
* xarray so NOP is fine. This child MR cannot be destroyed here because
236+
* we are under its umem_mutex.
237+
*/
231238
if (!refcount_inc_not_zero(&imr->mmkey.usecount))
232239
return;
233240

234-
xa_erase(&imr->implicit_children, idx);
241+
xa_lock(&imr->implicit_children);
242+
if (__xa_cmpxchg(&imr->implicit_children, idx, mr, NULL, GFP_KERNEL) !=
243+
mr) {
244+
xa_unlock(&imr->implicit_children);
245+
return;
246+
}
247+
235248
if (MLX5_CAP_ODP(mr_to_mdev(mr)->mdev, mem_page_fault))
236-
xa_erase(&mr_to_mdev(mr)->odp_mkeys,
237-
mlx5_base_mkey(mr->mmkey.key));
249+
__xa_erase(&mr_to_mdev(mr)->odp_mkeys,
250+
mlx5_base_mkey(mr->mmkey.key));
251+
xa_unlock(&imr->implicit_children);
238252

239253
/* Freeing a MR is a sleeping operation, so bounce to a work queue */
240254
INIT_WORK(&mr->odp_destroy.work, free_implicit_child_mr_work);
@@ -500,18 +514,18 @@ static struct mlx5_ib_mr *implicit_get_child_mr(struct mlx5_ib_mr *imr,
500514
refcount_inc(&ret->mmkey.usecount);
501515
goto out_lock;
502516
}
503-
xa_unlock(&imr->implicit_children);
504517

505518
if (MLX5_CAP_ODP(dev->mdev, mem_page_fault)) {
506-
ret = xa_store(&dev->odp_mkeys, mlx5_base_mkey(mr->mmkey.key),
507-
&mr->mmkey, GFP_KERNEL);
519+
ret = __xa_store(&dev->odp_mkeys, mlx5_base_mkey(mr->mmkey.key),
520+
&mr->mmkey, GFP_KERNEL);
508521
if (xa_is_err(ret)) {
509522
ret = ERR_PTR(xa_err(ret));
510-
xa_erase(&imr->implicit_children, idx);
511-
goto out_mr;
523+
__xa_erase(&imr->implicit_children, idx);
524+
goto out_lock;
512525
}
513526
mr->mmkey.type = MLX5_MKEY_IMPLICIT_CHILD;
514527
}
528+
xa_unlock(&imr->implicit_children);
515529
mlx5_ib_dbg(mr_to_mdev(imr), "key %x mr %p\n", mr->mmkey.key, mr);
516530
return mr;
517531

0 commit comments

Comments
 (0)