Skip to content

Commit 58e84f6

Browse files
MarkZhang81rleon
authored andcommitted
RDMA/cma: Allow UD qp_type to join multicast only
As for multicast: - The SIDR is the only mode that makes sense; - Besides PS_UDP, other port spaces like PS_IB is also allowed, as it is UD compatible. In this case qkey also needs to be set [1]. This patch allows only UD qp_type to join multicast, and set qkey to default if it's not set, to fix an uninit-value error: the ib->rec.qkey field is accessed without being initialized. ===================================================== BUG: KMSAN: uninit-value in cma_set_qkey drivers/infiniband/core/cma.c:510 [inline] BUG: KMSAN: uninit-value in cma_make_mc_event+0xb73/0xe00 drivers/infiniband/core/cma.c:4570 cma_set_qkey drivers/infiniband/core/cma.c:510 [inline] cma_make_mc_event+0xb73/0xe00 drivers/infiniband/core/cma.c:4570 cma_iboe_join_multicast drivers/infiniband/core/cma.c:4782 [inline] rdma_join_multicast+0x2b83/0x30a0 drivers/infiniband/core/cma.c:4814 ucma_process_join+0xa76/0xf60 drivers/infiniband/core/ucma.c:1479 ucma_join_multicast+0x1e3/0x250 drivers/infiniband/core/ucma.c:1546 ucma_write+0x639/0x6d0 drivers/infiniband/core/ucma.c:1732 vfs_write+0x8ce/0x2030 fs/read_write.c:588 ksys_write+0x28c/0x520 fs/read_write.c:643 __do_sys_write fs/read_write.c:655 [inline] __se_sys_write fs/read_write.c:652 [inline] __ia32_sys_write+0xdb/0x120 fs/read_write.c:652 do_syscall_32_irqs_on arch/x86/entry/common.c:114 [inline] __do_fast_syscall_32+0x96/0xf0 arch/x86/entry/common.c:180 do_fast_syscall_32+0x34/0x70 arch/x86/entry/common.c:205 do_SYSENTER_32+0x1b/0x20 arch/x86/entry/common.c:248 entry_SYSENTER_compat_after_hwframe+0x4d/0x5c Local variable ib.i created at: cma_iboe_join_multicast drivers/infiniband/core/cma.c:4737 [inline] rdma_join_multicast+0x586/0x30a0 drivers/infiniband/core/cma.c:4814 ucma_process_join+0xa76/0xf60 drivers/infiniband/core/ucma.c:1479 CPU: 0 PID: 29874 Comm: syz-executor.3 Not tainted 5.16.0-rc3-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 ===================================================== [1] https://lore.kernel.org/linux-rdma/[email protected]/ Fixes: b5de0c6 ("RDMA/cma: Fix use after free race in roce multicast join") Reported-by: [email protected] Signed-off-by: Mark Zhang <[email protected]> Link: https://lore.kernel.org/r/58a4a98323b5e6b1282e83f6b76960d06e43b9fa.1679309909.git.leon@kernel.org Signed-off-by: Leon Romanovsky <[email protected]>
1 parent 6bd1bca commit 58e84f6

1 file changed

Lines changed: 34 additions & 26 deletions

File tree

  • drivers/infiniband/core

drivers/infiniband/core/cma.c

Lines changed: 34 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -624,22 +624,11 @@ static inline unsigned short cma_family(struct rdma_id_private *id_priv)
624624
return id_priv->id.route.addr.src_addr.ss_family;
625625
}
626626

627-
static int cma_set_qkey(struct rdma_id_private *id_priv, u32 qkey)
627+
static int cma_set_default_qkey(struct rdma_id_private *id_priv)
628628
{
629629
struct ib_sa_mcmember_rec rec;
630630
int ret = 0;
631631

632-
if (id_priv->qkey) {
633-
if (qkey && id_priv->qkey != qkey)
634-
return -EINVAL;
635-
return 0;
636-
}
637-
638-
if (qkey) {
639-
id_priv->qkey = qkey;
640-
return 0;
641-
}
642-
643632
switch (id_priv->id.ps) {
644633
case RDMA_PS_UDP:
645634
case RDMA_PS_IB:
@@ -659,6 +648,16 @@ static int cma_set_qkey(struct rdma_id_private *id_priv, u32 qkey)
659648
return ret;
660649
}
661650

651+
static int cma_set_qkey(struct rdma_id_private *id_priv, u32 qkey)
652+
{
653+
if (!qkey ||
654+
(id_priv->qkey && (id_priv->qkey != qkey)))
655+
return -EINVAL;
656+
657+
id_priv->qkey = qkey;
658+
return 0;
659+
}
660+
662661
static void cma_translate_ib(struct sockaddr_ib *sib, struct rdma_dev_addr *dev_addr)
663662
{
664663
dev_addr->dev_type = ARPHRD_INFINIBAND;
@@ -1229,7 +1228,7 @@ static int cma_ib_init_qp_attr(struct rdma_id_private *id_priv,
12291228
*qp_attr_mask = IB_QP_STATE | IB_QP_PKEY_INDEX | IB_QP_PORT;
12301229

12311230
if (id_priv->id.qp_type == IB_QPT_UD) {
1232-
ret = cma_set_qkey(id_priv, 0);
1231+
ret = cma_set_default_qkey(id_priv);
12331232
if (ret)
12341233
return ret;
12351234

@@ -4569,7 +4568,10 @@ static int cma_send_sidr_rep(struct rdma_id_private *id_priv,
45694568
memset(&rep, 0, sizeof rep);
45704569
rep.status = status;
45714570
if (status == IB_SIDR_SUCCESS) {
4572-
ret = cma_set_qkey(id_priv, qkey);
4571+
if (qkey)
4572+
ret = cma_set_qkey(id_priv, qkey);
4573+
else
4574+
ret = cma_set_default_qkey(id_priv);
45734575
if (ret)
45744576
return ret;
45754577
rep.qp_num = id_priv->qp_num;
@@ -4774,9 +4776,7 @@ static void cma_make_mc_event(int status, struct rdma_id_private *id_priv,
47744776
enum ib_gid_type gid_type;
47754777
struct net_device *ndev;
47764778

4777-
if (!status)
4778-
status = cma_set_qkey(id_priv, be32_to_cpu(multicast->rec.qkey));
4779-
else
4779+
if (status)
47804780
pr_debug_ratelimited("RDMA CM: MULTICAST_ERROR: failed to join multicast. status %d\n",
47814781
status);
47824782

@@ -4804,7 +4804,7 @@ static void cma_make_mc_event(int status, struct rdma_id_private *id_priv,
48044804
}
48054805

48064806
event->param.ud.qp_num = 0xFFFFFF;
4807-
event->param.ud.qkey = be32_to_cpu(multicast->rec.qkey);
4807+
event->param.ud.qkey = id_priv->qkey;
48084808

48094809
out:
48104810
if (ndev)
@@ -4823,8 +4823,11 @@ static int cma_ib_mc_handler(int status, struct ib_sa_multicast *multicast)
48234823
READ_ONCE(id_priv->state) == RDMA_CM_DESTROYING)
48244824
goto out;
48254825

4826-
cma_make_mc_event(status, id_priv, multicast, &event, mc);
4827-
ret = cma_cm_event_handler(id_priv, &event);
4826+
ret = cma_set_qkey(id_priv, be32_to_cpu(multicast->rec.qkey));
4827+
if (!ret) {
4828+
cma_make_mc_event(status, id_priv, multicast, &event, mc);
4829+
ret = cma_cm_event_handler(id_priv, &event);
4830+
}
48284831
rdma_destroy_ah_attr(&event.param.ud.ah_attr);
48294832
WARN_ON(ret);
48304833

@@ -4877,9 +4880,11 @@ static int cma_join_ib_multicast(struct rdma_id_private *id_priv,
48774880
if (ret)
48784881
return ret;
48794882

4880-
ret = cma_set_qkey(id_priv, 0);
4881-
if (ret)
4882-
return ret;
4883+
if (!id_priv->qkey) {
4884+
ret = cma_set_default_qkey(id_priv);
4885+
if (ret)
4886+
return ret;
4887+
}
48834888

48844889
cma_set_mgid(id_priv, (struct sockaddr *) &mc->addr, &rec.mgid);
48854890
rec.qkey = cpu_to_be32(id_priv->qkey);
@@ -4956,9 +4961,6 @@ static int cma_iboe_join_multicast(struct rdma_id_private *id_priv,
49564961
cma_iboe_set_mgid(addr, &ib.rec.mgid, gid_type);
49574962

49584963
ib.rec.pkey = cpu_to_be16(0xffff);
4959-
if (id_priv->id.ps == RDMA_PS_UDP)
4960-
ib.rec.qkey = cpu_to_be32(RDMA_UDP_QKEY);
4961-
49624964
if (dev_addr->bound_dev_if)
49634965
ndev = dev_get_by_index(dev_addr->net, dev_addr->bound_dev_if);
49644966
if (!ndev)
@@ -4984,6 +4986,9 @@ static int cma_iboe_join_multicast(struct rdma_id_private *id_priv,
49844986
if (err || !ib.rec.mtu)
49854987
return err ?: -EINVAL;
49864988

4989+
if (!id_priv->qkey)
4990+
cma_set_default_qkey(id_priv);
4991+
49874992
rdma_ip2gid((struct sockaddr *)&id_priv->id.route.addr.src_addr,
49884993
&ib.rec.port_gid);
49894994
INIT_WORK(&mc->iboe_join.work, cma_iboe_join_work_handler);
@@ -5009,6 +5014,9 @@ int rdma_join_multicast(struct rdma_cm_id *id, struct sockaddr *addr,
50095014
READ_ONCE(id_priv->state) != RDMA_CM_ADDR_RESOLVED))
50105015
return -EINVAL;
50115016

5017+
if (id_priv->id.qp_type != IB_QPT_UD)
5018+
return -EINVAL;
5019+
50125020
mc = kzalloc(sizeof(*mc), GFP_KERNEL);
50135021
if (!mc)
50145022
return -ENOMEM;

0 commit comments

Comments
 (0)