Commit 875ab4a8 authored by Li Zhijian's avatar Li Zhijian Committed by Jason Gunthorpe
Browse files

RDMA/rxe: Make sure requested access is a subset of {mr,mw}->access 

We should reject the requests with access flags that is not registered by
MR/MW. For example, lookup_mr() should return NULL when requested access
is 0x03 and mr->access is 0x01.

Link: https://lore.kernel.org/r/20220927055337.22630-2-lizhijian@fujitsu.com


Signed-off-by: default avatarLi Zhijian <lizhijian@fujitsu.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 63a18bae

drivers/infiniband/sw/rxe/rxe_mr.c

+1 −1
Original line number Diff line number Diff line
@@ -511,7 +511,7 @@ struct rxe_mr *lookup_mr(struct rxe_pd *pd, int access, u32 key, 


	if (unlikely((type == RXE_LOOKUP_LOCAL && mr->lkey != key) ||

		     (type == RXE_LOOKUP_REMOTE && mr->rkey != key) ||

		     mr_pd(mr) != pd || (access && !(access & mr->access)) ||

		     mr_pd(mr) != pd || ((access & mr->access) != access) ||

		     mr->state != RXE_MR_STATE_VALID)) {

		rxe_put(mr);

		mr = NULL;

drivers/infiniband/sw/rxe/rxe_mw.c

+1 −2
Original line number Diff line number Diff line
@@ -293,8 +293,7 @@ struct rxe_mw *rxe_lookup_mw(struct rxe_qp *qp, int access, u32 rkey) 


	if (unlikely((mw->rkey != rkey) || rxe_mw_pd(mw) != pd ||

		     (mw->ibmw.type == IB_MW_TYPE_2 && mw->qp != qp) ||

		     (mw->length == 0) ||

		     (access && !(access & mw->access)) ||

		     (mw->length == 0) || ((access & mw->access) != access) ||

		     mw->state != RXE_MW_STATE_VALID)) {

		rxe_put(mw);

		return NULL;