From: Jason Gunthorpe <jgg@nvidia.com>
Date: Fri, 9 Dec 2022 19:52:17 +0000 (-0400)
Subject: Merge tag 'v6.1-rc8' into rdma.git for-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d69e8c63fcbbf695ff7ff2c6d26efead23cfbb3a;p=linux.git

Merge tag 'v6.1-rc8' into rdma.git for-next

For dependencies in following patches

Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
---

d69e8c63fcbbf695ff7ff2c6d26efead23cfbb3a
diff --cc drivers/infiniband/sw/rxe/rxe_resp.c
index 6ac544477f3f7,693081e813ec0..12eb85e8d4154
--- a/drivers/infiniband/sw/rxe/rxe_resp.c
+++ b/drivers/infiniband/sw/rxe/rxe_resp.c
@@@ -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;