Commit 333cb98f authored Jul 02, 2018 by Tarick Bedeir Committed by Greg Kroah-Hartman Oct 03, 2018

IB/mlx4: Test port number before querying type.



[ Upstream commit f1228867adaf8890826f2b59e4caddb1c5cc2df7 ]

rdma_ah_find_type() can reach into ib_device->port_immutable with a
potentially out-of-bounds port number, so check that the port number is
valid first.

Fixes: 44c58487 ("IB/core: Define 'ib' and 'roce' rdma_ah_attr types")
Signed-off-by: Tarick Bedeir <tarick@google.com>
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 1f94cf4c

drivers/infiniband/hw/mlx4/qp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -4014,9 +4014,9 @@ static void to_rdma_ah_attr(struct mlx4_ib_dev *ibdev,
		u8 port_num = path->sched_queue & 0x40 ? 2 : 1;

		memset(ah_attr, 0, sizeof(*ah_attr));
		ah_attr->type = rdma_ah_find_type(&ibdev->ib_dev, port_num);
		if (port_num == 0 \|\| port_num > dev->caps.num_ports)
		return;
		ah_attr->type = rdma_ah_find_type(&ibdev->ib_dev, port_num);

		if (ah_attr->type == RDMA_AH_ATTR_TYPE_ROCE)
		rdma_ah_set_sl(ah_attr, ((path->sched_queue >> 3) & 0x7) \|