Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 893e55eb authored by Jack Morgenstein's avatar Jack Morgenstein Committed by Greg Kroah-Hartman
Browse files

IB/mlx4: Test return value of calls to ib_get_cached_pkey 

[ Upstream commit 6693ca95bd4330a0ad7326967e1f9bcedd6b0800 ]

In the mlx4_ib_post_send() flow, some functions call ib_get_cached_pkey()
without checking its return value. If ib_get_cached_pkey() returns an
error code, these functions should return failure.

Fixes: 1ffeb2eb ("IB/mlx4: SR-IOV IB context objects and proxy/tunnel SQP support")
Fixes: 225c7b1f ("IB/mlx4: Add a driver Mellanox ConnectX InfiniBand adapters")
Fixes: e622f2f4 ("IB: split struct ib_send_wr")
Link: https://lore.kernel.org/r/20200426075921.130074-1-leon@kernel.org


Signed-off-by: default avatarJack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 35825430

drivers/infiniband/hw/mlx4/qp.c

+11 −3
Original line number Diff line number Diff line
@@ -2807,6 +2807,7 @@ static int build_sriov_qp0_header(struct mlx4_ib_sqp *sqp, 
	int send_size;

	int header_size;

	int spc;

	int err;

	int i;



	if (wr->wr.opcode != IB_WR_SEND)
@@ -2841,7 +2842,9 @@ static int build_sriov_qp0_header(struct mlx4_ib_sqp *sqp, 


	sqp->ud_header.lrh.virtual_lane    = 0;

	sqp->ud_header.bth.solicited_event = !!(wr->wr.send_flags & IB_SEND_SOLICITED);

	ib_get_cached_pkey(ib_dev, sqp->qp.port, 0, &pkey);

	err = ib_get_cached_pkey(ib_dev, sqp->qp.port, 0, &pkey);

	if (err)

		return err;

	sqp->ud_header.bth.pkey = cpu_to_be16(pkey);

	if (sqp->qp.mlx4_ib_qp_type == MLX4_IB_QPT_TUN_SMI_OWNER)

		sqp->ud_header.bth.destination_qpn = cpu_to_be32(wr->remote_qpn);
@@ -3128,9 +3131,14 @@ static int build_mlx_header(struct mlx4_ib_sqp *sqp, const struct ib_ud_wr *wr, 
	}

	sqp->ud_header.bth.solicited_event = !!(wr->wr.send_flags & IB_SEND_SOLICITED);

	if (!sqp->qp.ibqp.qp_num)

		ib_get_cached_pkey(ib_dev, sqp->qp.port, sqp->pkey_index, &pkey);

		err = ib_get_cached_pkey(ib_dev, sqp->qp.port, sqp->pkey_index,

					 &pkey);

	else

		ib_get_cached_pkey(ib_dev, sqp->qp.port, wr->pkey_index, &pkey);

		err = ib_get_cached_pkey(ib_dev, sqp->qp.port, wr->pkey_index,

					 &pkey);

	if (err)

		return err;



	sqp->ud_header.bth.pkey = cpu_to_be16(pkey);

	sqp->ud_header.bth.destination_qpn = cpu_to_be32(wr->remote_qpn);

	sqp->ud_header.bth.psn = cpu_to_be32((sqp->send_psn++) & ((1 << 24) - 1));