Merge tag 'v6.1-rc8' into rdma.git for-next
authorJason Gunthorpe <jgg@nvidia.com>
Fri, 9 Dec 2022 19:52:17 +0000 (15:52 -0400)
committerJason Gunthorpe <jgg@nvidia.com>
Fri, 9 Dec 2022 19:52:17 +0000 (15:52 -0400)
For dependencies in following patches

Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
1  2 
MAINTAINERS
drivers/infiniband/core/cma.c
drivers/infiniband/core/device.c
drivers/infiniband/core/nldev.c
drivers/infiniband/hw/hns/hns_roce_hw_v2.c
drivers/infiniband/hw/hns/hns_roce_hw_v2.h
drivers/infiniband/hw/qedr/main.c
drivers/infiniband/sw/rxe/rxe_resp.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -879,16 -806,15 +879,18 @@@ static enum resp_states read_reply(stru
  
        skb = prepare_ack_packet(qp, &ack_pkt, opcode, payload,
                                 res->cur_psn, AETH_ACK_UNLIMITED);
-       if (!skb)
+       if (!skb) {
+               rxe_put(mr);
                return RESPST_ERR_RNR;
+       }
  
 -      rxe_mr_copy(mr, res->read.va, payload_addr(&ack_pkt),
 -                  payload, RXE_FROM_MR_OBJ);
 -      if (mr)
 -              rxe_put(mr);
 +      err = rxe_mr_copy(mr, res->read.va, payload_addr(&ack_pkt),
 +                        payload, RXE_FROM_MR_OBJ);
 +      rxe_put(mr);
 +      if (err) {
 +              kfree_skb(skb);
 +              return RESPST_ERR_RKEY_VIOLATION;
 +      }
  
        if (bth_pad(&ack_pkt)) {
                u8 *pad = payload_addr(&ack_pkt) + payload;