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

Commit 8561eae6 authored by Michael J. Ruhl's avatar Michael J. Ruhl Committed by Doug Ledford
Browse files

IB/core: For multicast functions, verify that LIDs are multicast LIDs 



The Infiniband spec defines "A multicast address is defined by a
MGID and a MLID" (section 10.5).  Currently the MLID value is not
validated.

Add check to verify that the MLID value is in the correct address
range.

Fixes: 0c33aeed ("[IB] Add checks to multicast attach and detach")
Cc: stable@vger.kernel.org
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Reviewed-by: default avatarDasaratharaman Chandramouli <dasaratharaman.chandramouli@intel.com>
Signed-off-by: default avatarMichael J. Ruhl <michael.j.ruhl@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 72fb70f5

drivers/infiniband/core/verbs.c

+6 −2
Original line number Diff line number Diff line
@@ -1519,7 +1519,9 @@ int ib_attach_mcast(struct ib_qp *qp, union ib_gid *gid, u16 lid) 


	if (!qp->device->attach_mcast)

		return -ENOSYS;

	if (gid->raw[0] != 0xff || qp->qp_type != IB_QPT_UD)

	if (gid->raw[0] != 0xff || qp->qp_type != IB_QPT_UD ||

	    lid < be16_to_cpu(IB_MULTICAST_LID_BASE) ||

	    lid == be16_to_cpu(IB_LID_PERMISSIVE))

		return -EINVAL;



	ret = qp->device->attach_mcast(qp, gid, lid);
@@ -1535,7 +1537,9 @@ int ib_detach_mcast(struct ib_qp *qp, union ib_gid *gid, u16 lid) 


	if (!qp->device->detach_mcast)

		return -ENOSYS;

	if (gid->raw[0] != 0xff || qp->qp_type != IB_QPT_UD)

	if (gid->raw[0] != 0xff || qp->qp_type != IB_QPT_UD ||

	    lid < be16_to_cpu(IB_MULTICAST_LID_BASE) ||

	    lid == be16_to_cpu(IB_LID_PERMISSIVE))

		return -EINVAL;



	ret = qp->device->detach_mcast(qp, gid, lid);