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

Commit 61f18381 authored by Bob Pearson's avatar Bob Pearson Committed by Greg Kroah-Hartman
Browse files

RDMA/rxe: Fix coding error in rxe_recv.c 

[ Upstream commit 7d9ae80e31df57dd3253e1ec514f0000aa588a81 ]

check_type_state() in rxe_recv.c is written as if the type bits in the
packet opcode were a bit mask which is not correct. This patch corrects
this code to compare all 3 type bits to the required type.

Fixes: 8700e3e7 ("Soft RoCE driver")
Link: https://lore.kernel.org/r/20210127214500.3707-1-rpearson@hpe.com


Signed-off-by: default avatarBob Pearson <rpearson@hpe.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent e9089d52

drivers/infiniband/sw/rxe/rxe_recv.c

+8 −3
Original line number Diff line number Diff line
@@ -36,21 +36,26 @@ 
#include "rxe.h"

#include "rxe_loc.h"



/* check that QP matches packet opcode type and is in a valid state */

static int check_type_state(struct rxe_dev *rxe, struct rxe_pkt_info *pkt,

			    struct rxe_qp *qp)

{

	unsigned int pkt_type;



	if (unlikely(!qp->valid))

		goto err1;



	pkt_type = pkt->opcode & 0xe0;



	switch (qp_type(qp)) {

	case IB_QPT_RC:

		if (unlikely((pkt->opcode & IB_OPCODE_RC) != 0)) {

		if (unlikely(pkt_type != IB_OPCODE_RC)) {

			pr_warn_ratelimited("bad qp type\n");

			goto err1;

		}

		break;

	case IB_QPT_UC:

		if (unlikely(!(pkt->opcode & IB_OPCODE_UC))) {

		if (unlikely(pkt_type != IB_OPCODE_UC)) {

			pr_warn_ratelimited("bad qp type\n");

			goto err1;

		}
@@ -58,7 +63,7 @@ static int check_type_state(struct rxe_dev *rxe, struct rxe_pkt_info *pkt, 
	case IB_QPT_UD:

	case IB_QPT_SMI:

	case IB_QPT_GSI:

		if (unlikely(!(pkt->opcode & IB_OPCODE_UD))) {

		if (unlikely(pkt_type != IB_OPCODE_UD)) {

			pr_warn_ratelimited("bad qp type\n");

			goto err1;

		}