diff options
| author | Dennis Dalessandro <dennis.dalessandro@intel.com> | 2018-09-26 10:55:53 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-11-24 08:19:28 +0100 |
| commit | 449b9ae3504c425a615d2dc6452e33cd883e1bf5 (patch) | |
| tree | 1a0ae7d615e05c5fa2c9f4cdcd47183b07cd5d2e /drivers/infiniband/ulp | |
| parent | e0dee1c839e3bc66e8a5ca0316eec9ca742d7c02 (diff) | |
| download | linux-449b9ae3504c425a615d2dc6452e33cd883e1bf5.tar.gz linux-449b9ae3504c425a615d2dc6452e33cd883e1bf5.tar.bz2 linux-449b9ae3504c425a615d2dc6452e33cd883e1bf5.zip | |
IB/hfi1: Ensure ucast_dlid access doesnt exceed bounds
[ 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>
Diffstat (limited to 'drivers/infiniband/ulp')
| -rw-r--r-- | drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.c b/drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.c index 267da8215e08..31cd361416ac 100644 --- a/drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.c +++ b/drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.c @@ -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]; } } |
