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: Li Zhijian <lizhijian@fujitsu.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

diff --git a/drivers/infiniband/sw/rxe/rxe_mr.c b/drivers/infiniband/sw/rxe/rxe_mr.c
index d4f10c2d1aa79ea49eb4fc4bb51ba3cb63b02d47..014c27bba049c4832b4621597b3ae1e66ff1bfbe 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_mr.c
+++ b/drivers/infiniband/sw/rxe/rxe_mr.c
@@ -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;

diff --git a/drivers/infiniband/sw/rxe/rxe_mw.c b/drivers/infiniband/sw/rxe/rxe_mw.c
index 902b7df7aaedb626ce33075da22e2cd3ebdbc685..8df1c9066ed89a89dba4393b5f3c783ef12307a3 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_mw.c
+++ b/drivers/infiniband/sw/rxe/rxe_mw.c
@@ -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;