Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42fe28f6 authored by Chuck Lever's avatar Chuck Lever Committed by Anna Schumaker
Browse files

xprtrdma: Do not leak an MW during a DMA map failure 



Based on code audit.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Tested-by: default avatarSteve Wise <swise@opengridcomputing.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 505bbe64

net/sunrpc/xprtrdma/fmr_ops.c

+1 −0
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ fmr_op_map(struct rpcrdma_xprt *r_xprt, struct rpcrdma_mr_seg *seg, 
out_dmamap_err:

	pr_err("rpcrdma: failed to dma map sg %p sg_nents %u\n",

	       mw->mw_sg, mw->mw_nents);

	rpcrdma_defer_mr_recovery(mw);

	return -ENOMEM;



out_maperr:

net/sunrpc/xprtrdma/frwr_ops.c

+1 −0
Original line number Diff line number Diff line
@@ -438,6 +438,7 @@ frwr_op_map(struct rpcrdma_xprt *r_xprt, struct rpcrdma_mr_seg *seg, 
out_dmamap_err:

	pr_err("rpcrdma: failed to dma map sg %p sg_nents %u\n",

	       mw->mw_sg, mw->mw_nents);

	rpcrdma_defer_mr_recovery(mw);

	return -ENOMEM;



out_mapmr_err: