summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlga Kornievskaia <kolga@netapp.com>2019-11-15 15:12:49 -0500
committerTrond Myklebust <trond.myklebust@hammerspace.com>2019-11-18 10:50:30 +0100
commit66588abe2db066a8927b67cbb8b82a1292819086 (patch)
tree3f6b6e43776eb1a96ec9f498c920370051842f45
parent843aa17a35bf00be0f3a1108f4691bc45761cd23 (diff)
downloadlinux-stable-66588abe2db066a8927b67cbb8b82a1292819086.tar.gz
linux-stable-66588abe2db066a8927b67cbb8b82a1292819086.tar.bz2
linux-stable-66588abe2db066a8927b67cbb8b82a1292819086.zip
NFSv4.2 fix kfree in __nfs42_copy_file_range
This is triggering problems with static analysis with Coverity Reported-by: Colin King <colin.king@netapp.com> Signed-off-by: Olga Kornievskaia <kolga@netapp.com> Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
-rw-r--r--fs/nfs/nfs4file.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c
index b054d57e77d9..ef8c16779f4c 100644
--- a/fs/nfs/nfs4file.c
+++ b/fs/nfs/nfs4file.c
@@ -177,7 +177,8 @@ retry:
ret = nfs42_proc_copy(file_in, pos_in, file_out, pos_out, count,
nss, cnrs, sync);
out:
- kfree(cn_resp);
+ if (!nfs42_files_from_same_server(file_in, file_out))
+ kfree(cn_resp);
if (ret == -EAGAIN)
goto retry;
return ret;