RDMA/rxe: Fix ref count error in check_rkey()
Subsystems (2)
PATCH 1/1 RDMA/rxe: Fix ref count error in check_rkey()
There is a reference count error in error path code and a potential race in check_rkey() in rxe_resp.c. When looking up the rkey for a memory window the reference to the mw from rxe_lookup_mw() is dropped before a reference is taken on the mr referenced by the mw. If the mr is destroyed immediately after the call to rxe_put(mw) the mr pointer is unprotected and may end up pointing at freed memory. The rxe_get(mr) call should take place before the rxe_put(mw) call.
All errors in check_rkey() call rxe_put(mw) if mw is not NULL but it was already called after the above. The mw pointer should be set to NULL after the rxe_put(mw) call to prevent this from happening.
This patch corrects these errors.
--- drivers/infiniband/sw/rxe/rxe_resp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/infiniband/sw/rxe/rxe_resp.c +2 -1
@@ -489,8 +489,9 @@ static enum resp_states check_rkey(struct rxe_qp *qp,if (mw->access &IB_ZERO_BASED ) qp->resp.offset = mw->addr; -rxe_put (mw);rxe_get (mr); +rxe_put (mw); + mw =NULL ; }else { mr =lookup_mr (qp->pd, access, rkey,RXE_LOOKUP_REMOTE );if (!mr) {
Signature · 1 line
2.37.2
Quoted 14 lines · Bob Pearson
There is a reference count error in error path code and a potential race in
check_rkey()inrxe_resp.c. When looking up the rkey for a memory window the reference to the mw fromrxe_lookup_mw()is dropped before a reference is taken on the mr referenced by the mw. If the mr is destroyed immediately after the call torxe_put(mw)the mr pointer is unprotected and may end up pointing at freed memory. Therxe_get(mr)call should take place before therxe_put(mw)call.All errors in
check_rkey()callrxe_put(mw)if mw is not NULL but it was already called after the above. The mw pointer should be set to NULL after therxe_put(mw)call to prevent this from happening.
Quoted 7 lines
This patch corrects these errors.
Fixes cdd0b85675ae ("RDMA/rxe: Implement memory access through MWs")Signed-off-by Bob Pearson <[email protected]>--- drivers/infiniband/sw/rxe/rxe_resp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Applied to for-rc, thanks
Jason
Quoted 23 lines · Jason Gunthorpe
Quoted 14 lines · Bob Pearson
There is a reference count error in error path code and a potential race in
check_rkey()inrxe_resp.c. When looking up the rkey for a memory window the reference to the mw fromrxe_lookup_mw()is dropped before a reference is taken on the mr referenced by the mw. If the mr is destroyed immediately after the call torxe_put(mw)the mr pointer is unprotected and may end up pointing at freed memory. Therxe_get(mr)call should take place before therxe_put(mw)call.All errors in
check_rkey()callrxe_put(mw)if mw is not NULL but it was already called after the above. The mw pointer should be set to NULL after therxe_put(mw)call to prevent this from happening.Quoted 7 lines
This patch corrects these errors.
Fixes cdd0b85675ae ("RDMA/rxe: Implement memory access through MWs")Signed-off-by Bob Pearson <[email protected]>--- drivers/infiniband/sw/rxe/rxe_resp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Quoted 3 lines
Applied to for-rc, thanks
Jason
thanks