Commit 8605cf0e authored Aug 28, 2019 by Misono Tomohiro Committed by Trond Myklebust Mar 22, 2020

NFS: direct.c: Fix memory leak of dreq when nfs_get_lock_context fails



When dreq is allocated by nfs_direct_req_alloc(), dreq->kref is
initialized to 2. Therefore we need to call nfs_direct_req_release()
twice to release the allocated dreq. Usually it is called in
nfs_file_direct_{read, write}() and nfs_direct_complete().

However, current code only calls nfs_direct_req_relese() once if
nfs_get_lock_context() fails in nfs_file_direct_{read, write}().
So, that case would result in memory leak.

Fix this by adding the missing call.

Signed-off-by: Misono Tomohiro <misono.tomohiro@jp.fujitsu.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

parent 3cab1854

fs/nfs/direct.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -571,6 +571,7 @@ ssize_t nfs_file_direct_read(struct kiocb iocb, struct iov_iter iter)
		l_ctx = nfs_get_lock_context(dreq->ctx);
		if (IS_ERR(l_ctx)) {
		result = PTR_ERR(l_ctx);
		nfs_direct_req_release(dreq);
		goto out_release;
		}
		dreq->l_ctx = l_ctx;
		@@ -990,6 +991,7 @@ ssize_t nfs_file_direct_write(struct kiocb iocb, struct iov_iter iter)
		l_ctx = nfs_get_lock_context(dreq->ctx);
		if (IS_ERR(l_ctx)) {
		result = PTR_ERR(l_ctx);
		nfs_direct_req_release(dreq);
		goto out_release;
		}
		dreq->l_ctx = l_ctx;

Admin message