| From b73dcd42d34d39de0dfe1d7827c92ef1ed0beb17 Mon Sep 17 00:00:00 2001 |
| From: "Michael J. Ruhl" <michael.j.ruhl@intel.com> |
| Date: Sun, 9 Apr 2017 10:15:51 -0700 |
| Subject: [PATCH] IB/core: For multicast functions, verify that LIDs are |
| multicast LIDs |
| |
| commit 8561eae60ff9417a50fa1fb2b83ae950dc5c1e21 upstream. |
| |
| 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: 0c33aeedb2cf ("[IB] Add checks to multicast attach and detach") |
| Cc: stable@vger.kernel.org |
| Reviewed-by: Ira Weiny <ira.weiny@intel.com> |
| Reviewed-by: Dasaratharaman Chandramouli <dasaratharaman.chandramouli@intel.com> |
| Signed-off-by: Michael J. Ruhl <michael.j.ruhl@intel.com> |
| Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com> |
| Reviewed-by: Leon Romanovsky <leonro@mellanox.com> |
| Signed-off-by: Doug Ledford <dledford@redhat.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c |
| index 5f88ccd6806b..99410954cdc9 100644 |
| --- a/drivers/infiniband/core/verbs.c |
| +++ b/drivers/infiniband/core/verbs.c |
| @@ -1517,7 +1517,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); |
| @@ -1533,7 +1535,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); |
| -- |
| 2.12.0 |
| |
