Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdbf6e0b authored by Parav Pandit's avatar Parav Pandit Committed by Greg Kroah-Hartman
Browse files

RDMA/cma: Do not ignore net namespace for unbound cm_id 



[ Upstream commit 643d213a9a034fa04f5575a40dfc8548e33ce04f ]

Currently if the cm_id is not bound to any netdevice, than for such cm_id,
net namespace is ignored; which is incorrect.

Regardless of cm_id bound to a netdevice or not, net namespace must
match. When a cm_id is bound to a netdevice, in such case net namespace
and netdevice both must match.

Fixes: 4c21b5bc ("IB/cma: Add net_dev and private data checks to RDMA CM")
Signed-off-by: default avatarParav Pandit <parav@mellanox.com>
Reviewed-by: default avatarDaniel Jurgens <danielj@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0d1d365d

drivers/infiniband/core/cma.c

+10 −3
Original line number Diff line number Diff line
@@ -1459,9 +1459,16 @@ static bool cma_match_net_dev(const struct rdma_cm_id *id, 
		       (addr->src_addr.ss_family == AF_IB ||

			cma_protocol_roce_dev_port(id->device, port_num));



	return !addr->dev_addr.bound_dev_if ||

	       (net_eq(dev_net(net_dev), addr->dev_addr.net) &&

		addr->dev_addr.bound_dev_if == net_dev->ifindex);

	/*

	 * Net namespaces must match, and if the listner is listening

	 * on a specific netdevice than netdevice must match as well.

	 */

	if (net_eq(dev_net(net_dev), addr->dev_addr.net) &&

	    (!!addr->dev_addr.bound_dev_if ==

	     (addr->dev_addr.bound_dev_if == net_dev->ifindex)))

		return true;

	else

		return false;

}



static struct rdma_id_private *cma_find_listener(