devr.ports[] has 2 entries, but it is indexed by port numbers taken from the NIC, which adversarial mode does not trust. handle_port_change() uses the EQE port before any validation, so port 0 wraps the index to UINT_MAX and a port above 2 overflows the array. mlx5_ib_create_gsi() gets a port already checked against phys_port_cnt, but that comes from the num_ports and num_vhca_ports FW caps, which may report more than 2 ports. Validate the port and bound it by ARRAY_SIZE() in both paths. Signed-off-by: Yishai Hadas --- drivers/infiniband/hw/mlx5/gsi.c | 4 ++++ drivers/infiniband/hw/mlx5/main.c | 11 ++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/infiniband/hw/mlx5/gsi.c b/drivers/infiniband/hw/mlx5/gsi.c index b2e2a219639d..7ce390a2820f 100644 --- a/drivers/infiniband/hw/mlx5/gsi.c +++ b/drivers/infiniband/hw/mlx5/gsi.c @@ -95,6 +95,10 @@ int mlx5_ib_create_gsi(struct ib_pd *pd, struct mlx5_ib_qp *mqp, int num_qps = 0; int ret; + if (!rdma_is_port_valid(&dev->ib_dev, port_num) || + port_num > ARRAY_SIZE(dev->devr.ports)) + return -EINVAL; + if (mlx5_ib_deth_sqpn_cap(dev)) { if (MLX5_CAP_GEN(dev->mdev, port_type) == MLX5_CAP_PORT_TYPE_IB) diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c index 69e11c06bd9c..0bf7e68a377d 100644 --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c @@ -3062,6 +3062,12 @@ static int handle_port_change(struct mlx5_ib_dev *ibdev, struct mlx5_eqe *eqe, { u32 port = (eqe->data.port.port >> 4) & 0xf; + if (!rdma_is_port_valid(&ibdev->ib_dev, port) || + port > ARRAY_SIZE(ibdev->devr.ports)) { + mlx5_ib_warn(ibdev, "warning: event on port %d\n", port); + return -EINVAL; + } + ibev->element.port_num = port; switch (eqe->sub_type) { @@ -3139,11 +3145,6 @@ static void mlx5_ib_handle_event(struct work_struct *_work) ibev.device = &ibdev->ib_dev; - if (!rdma_is_port_valid(&ibdev->ib_dev, ibev.element.port_num)) { - mlx5_ib_warn(ibdev, "warning: event on port %d\n", ibev.element.port_num); - goto out; - } - if (ibdev->ib_active) ib_dispatch_event(&ibev); -- 2.18.1