lkml.org 
[lkml]   [2021]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 345/663] RDMA/rxe: Fix coding error in rxe_recv.c
    Date
    From: Bob Pearson <rpearsonhpe@gmail.com>

    [ 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: 8700e3e7c485 ("Soft RoCE driver")
    Link: https://lore.kernel.org/r/20210127214500.3707-1-rpearson@hpe.com
    Signed-off-by: Bob Pearson <rpearson@hpe.com>
    Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/infiniband/sw/rxe/rxe_recv.c | 11 ++++++++---
    1 file changed, 8 insertions(+), 3 deletions(-)

    diff --git a/drivers/infiniband/sw/rxe/rxe_recv.c b/drivers/infiniband/sw/rxe/rxe_recv.c
    index c9984a28eecc7..db0ee5c3962e4 100644
    --- a/drivers/infiniband/sw/rxe/rxe_recv.c
    +++ b/drivers/infiniband/sw/rxe/rxe_recv.c
    @@ -9,21 +9,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;
    }
    @@ -31,7 +36,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;
    }
    --
    2.27.0


    \
     
     \ /
      Last update: 2021-03-02 01:11    [W:4.022 / U:0.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site