Commit d0c797e5 authored May 28, 2024 by Parav Pandit Committed by Zhengchao Shao May 28, 2024

IB/mlx4: Use port iterator and validation APIs

mainline inclusion
from mainline-v5.12-rc1
commit 6504c772
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9R4GV
CVE: CVE-2021-47265

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=6504c772551e809b4cc21fa720d6bba703d5c199

--------------------------------

Use IB core provided routine to check if the port is valid or not and to
iterate over IB ports.

Link: https://lore.kernel.org/r/20210127150010.1876121-10-leon@kernel.org


Signed-off-by: Parav Pandit <parav@nvidia.com>
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>

parent f300accf

drivers/infiniband/hw/mlx4/main.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1696,7 +1696,7 @@ static struct ib_flow mlx4_ib_create_flow(struct ib_qp qp,
		struct mlx4_dev *dev = (to_mdev(qp->device))->dev;
		int is_bonded = mlx4_is_bonded(dev);

		if (flow_attr->port < 1 \|\| flow_attr->port > qp->device->phys_port_cnt)
		if (!rdma_is_port_valid(qp->device, flow_attr->port))
		return ERR_PTR(-EINVAL);

		if (flow_attr->flags & ~IB_FLOW_ATTR_FLAGS_DONT_TRAP)

drivers/infiniband/hw/mlx4/sysfs.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -808,7 +808,7 @@ static void unregister_pkey_tree(struct mlx4_ib_dev *device)

		int mlx4_ib_device_register_sysfs(struct mlx4_ib_dev *dev)
		{
		int i;
		unsigned int i;
		int ret = 0;

		if (!mlx4_is_master(dev->dev))
		@@ -827,7 +827,7 @@ int mlx4_ib_device_register_sysfs(struct mlx4_ib_dev *dev)
		goto err_ports;
		}

		for (i = 1; i <= dev->ib_dev.phys_port_cnt; ++i) {
		rdma_for_each_port(&dev->ib_dev, i) {
		ret = add_port_entries(dev, i);
		if (ret)
		goto err_add_entries;