IB/hfi1: Ensure ucast_dlid access doesnt exceed bounds
authorDennis Dalessandro <dennis.dalessandro@intel.com>
Wed, 26 Sep 2018 17:55:53 +0000 (10:55 -0700)
committerJason Gunthorpe <jgg@mellanox.com>
Mon, 1 Oct 2018 01:21:12 +0000 (19:21 -0600)
The dlid assignment made by looking into the u_ucast_dlid array does not
do an explicit check for the size of the array. The code path to arrive at
def_port, the index value is long and complicated so its best to just have
an explicit check here.

Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.c

index 267da8215e08fe71b9d4920e1accf851d7723538..31cd361416ac9e1fc21d2d103c0743369eb34251 100644 (file)
@@ -351,7 +351,8 @@ static uint32_t opa_vnic_get_dlid(struct opa_vnic_adapter *adapter,
                        if (unlikely(!dlid))
                                v_warn("Null dlid in MAC address\n");
                } else if (def_port != OPA_VNIC_INVALID_PORT) {
-                       dlid = info->vesw.u_ucast_dlid[def_port];
+                       if (def_port < OPA_VESW_MAX_NUM_DEF_PORT)
+                               dlid = info->vesw.u_ucast_dlid[def_port];
                }
        }