iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Misono Tomohiro
2019-08-28 17:01:22 +09:00
committed by Trond Myklebust
parent 3cab1854b0
commit 8605cf0e85
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/nfs/direct.c
View File

@@ -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); l_ctx = nfs_get_lock_context(dreq->ctx);
if (IS_ERR(l_ctx)) { if (IS_ERR(l_ctx)) {
result = PTR_ERR(l_ctx); result = PTR_ERR(l_ctx);
nfs_direct_req_release(dreq);
goto out_release; goto out_release;
} }
dreq->l_ctx = l_ctx; 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); l_ctx = nfs_get_lock_context(dreq->ctx);
if (IS_ERR(l_ctx)) { if (IS_ERR(l_ctx)) {
result = PTR_ERR(l_ctx); result = PTR_ERR(l_ctx);
nfs_direct_req_release(dreq);
goto out_release; goto out_release;
} }
dreq->l_ctx = l_ctx; dreq->l_ctx = l_ctx;