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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 24 Nov 2019 07:22:52 +0000 (08:22 +0100)
[ Upstream commit 3144533bf667c8e53bb20656b78295960073e57b ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.c

index a72278e9cd274faae10c72c77cbaa909858f4643..9c8ddaaa6fbbf1a6d2d3a42b3b4270027df8ac9e 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];
                }
        }