xprtrdma: Fix regbuf data not freed in rpcrdma_req_create()

commit fd568aebdc3c021175c1a55718c47805e0e6d4a5 upstream.

If rdma receive buffer allocate failed, should call rpcrdma_regbuf_free()
to free the send buffer, otherwise, the buffer data will be leaked.

Fixes: 958d45265834 ("xprtrdma: Allocate req's regbufs at xprt create time")
Signed-off-by: Zhang Xiaoxu <zhangxiaoxu5@huawei.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
[Harshit: Backport to 5.4.y]
Also make the same change for 'req->rl_rdmabuf' at the same time as
this will also have the same memory leak problem as 'req->rl_sendbuf'
(This is because commit abcbcb00b95c530ae70c7502ddac3847d8f0b477 is not
in 5.4.y)
Signed-off-by: Harshit Mogalapalli <harshit.m.mogalapalli@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
index 0f4d39fdb48f2101fbee8227e528adb352b969af..cfae1a871578ff6cacfa0e3d10b3c8aac7a5a3b6 100644 (file)
--- a/net/sunrpc/xprtrdma/verbs.c
+++ b/net/sunrpc/xprtrdma/verbs.c
@@ -1034,9 +1034,9 @@ struct rpcrdma_req *rpcrdma_req_create(struct rpcrdma_xprt *r_xprt, size_t size,
        return req;
 
 out4:
-       kfree(req->rl_sendbuf);
+       rpcrdma_regbuf_free(req->rl_sendbuf);
 out3:
-       kfree(req->rl_rdmabuf);
+       rpcrdma_regbuf_free(req->rl_rdmabuf);
 out2:
        kfree(req);
 out1: