github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-06 13:37:36 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

RDMA/cma: Use correct address when leaving multicast group

Browse Source 
commit d9e410ebbe upstream.

In RoCE we should use cma_iboe_set_mgid() and not cma_set_mgid to generate
the mgid, otherwise we will generate an IGMP for an incorrect address.

Fixes: b5de0c60cc ("RDMA/cma: Fix use after free race in roce multicast join")
Link: https://lore.kernel.org/r/913bc6783fd7a95fe71ad9454e01653ee6fb4a9a.1642491047.git.leonro@nvidia.com
Signed-off-by: Maor Gottlieb <maorg@nvidia.com>
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Maor Gottlieb 2022-01-18 09:35:00 +02:00 committed by Greg Kroah-Hartman
parent aa4ecd995f
commit 371979069a
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/infiniband/core/cma.c
View File

@ -68,8 +68,8 @@ static const char * const cma_events[] = {
[RDMA_CM_EVENT_TIMEWAIT_EXIT] = "timewait exit", [RDMA_CM_EVENT_TIMEWAIT_EXIT] = "timewait exit",
}; };
static void cma_set_mgid(struct rdma_id_private *id_priv, struct sockaddr *addr, static void cma_iboe_set_mgid(struct sockaddr *addr, union ib_gid *mgid,
union ib_gid *mgid); enum ib_gid_type gid_type);
const char *__attribute_const__ rdma_event_msg(enum rdma_cm_event_type event) const char *__attribute_const__ rdma_event_msg(enum rdma_cm_event_type event)
{ {
@ -1840,17 +1840,19 @@ static void destroy_mc(struct rdma_id_private *id_priv,
if (dev_addr->bound_dev_if) if (dev_addr->bound_dev_if)
ndev = dev_get_by_index(dev_addr->net, ndev = dev_get_by_index(dev_addr->net,
dev_addr->bound_dev_if); dev_addr->bound_dev_if);
if (ndev) { if (ndev && !send_only) {
enum ib_gid_type gid_type;
union ib_gid mgid; union ib_gid mgid;
cma_set_mgid(id_priv, (struct sockaddr *)&mc->addr, gid_type = id_priv->cma_dev->default_gid_type
&mgid); [id_priv->id.port_num -
rdma_start_port(
if (!send_only) id_priv->cma_dev->device)];
cma_igmp_send(ndev, &mgid, false); cma_iboe_set_mgid((struct sockaddr *)&mc->addr, &mgid,
gid_type);
dev_put(ndev); cma_igmp_send(ndev, &mgid, false);
} }
dev_put(ndev);
cancel_work_sync(&mc->iboe_join.work); cancel_work_sync(&mc->iboe_join.work);
} }