Re: [PATCH] xprtrdma: Fix regbuf data not freed in rpcrdma_req_create()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




> On Nov 18, 2022, at 11:34 PM, Zhang Xiaoxu <zhangxiaoxu5@xxxxxxxxxx> wrote:
> 
> If rdma receive buffer allocate failed, should call rpcrdma_regbuf_free()
> to free the send buffer, otherwise, the buffer data will be leaked.
> 
> Fixes: 8cec3dba76a4 ("xprtrdma: rpcrdma_regbuf alignment")

Actually Fixes: bb93a1ae2bf4 ("xprtrdma: Allocate req's regbufs
at xprt create time") might be better. bb93a1ae2bf4 is the commit
that incorrectly added the kfree() to rpcrdma_req_create().
Even though 8cec3dba76a4 is what split the regbufs into two
allocations, your fix isn't applicable to the rpcrdma_req_create()
that's in 8cec3dba76a4.


> Signed-off-by: Zhang Xiaoxu <zhangxiaoxu5@xxxxxxxxxx>

I'm guessing the error path is getting exercised more once
f20f18c95630 ("xprtrdma: Prevent memory allocations from driving
a reclaim") has been applied. Good catch!

Reviewed-by: Chuck Lever <chuck.lever@xxxxxxxxxx>


> ---
> net/sunrpc/xprtrdma/verbs.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
> index 44b87e4274b4..b098fde373ab 100644
> --- a/net/sunrpc/xprtrdma/verbs.c
> +++ b/net/sunrpc/xprtrdma/verbs.c
> @@ -831,7 +831,7 @@ struct rpcrdma_req *rpcrdma_req_create(struct rpcrdma_xprt *r_xprt,
> 	return req;
> 
> out3:
> -	kfree(req->rl_sendbuf);
> +	rpcrdma_regbuf_free(req->rl_sendbuf);
> out2:
> 	kfree(req);
> out1:
> -- 
> 2.31.1
> 

--
Chuck Lever







[Index of Archives]     [Linux Filesystem Development]     [Linux USB Development]     [Linux Media Development]     [Video for Linux]     [Linux NILFS]     [Linux Audio Users]     [Yosemite Info]     [Linux SCSI]

  Powered by Linux