aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorOlga Kornievskaia <kolga@netapp.com>2019-11-15 15:13:19 -0500
committerTrond Myklebust <trond.myklebust@hammerspace.com>2019-11-18 10:50:41 +0100
commitf751c5452594f6ef77b39c78f9888275e60d0770 (patch)
tree60976acc78e4120a69dbbdc7e8b1c2590a0fe92d /fs/nfs
parentNFSv4.2 fix kfree in __nfs42_copy_file_range (diff)
downloadlinux-dev-f751c5452594f6ef77b39c78f9888275e60d0770.tar.xz
linux-dev-f751c5452594f6ef77b39c78f9888275e60d0770.zip
NFSv4.2 fix memory leak in nfs42_ssc_open
Static analysis with Coverity detected a memory leak Reported-by: Colin King <colin.king@canonical.com> Fixes: ec4b09250898 ("NFS: inter ssc open") Signed-off-by: Olga Kornievskaia <kolga@netapp.com> Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/nfs4file.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c
index ef8c16779f4c..620de905cba9 100644
--- a/fs/nfs/nfs4file.c
+++ b/fs/nfs/nfs4file.c
@@ -318,7 +318,7 @@ nfs42_ssc_open(struct vfsmount *ss_mnt, struct nfs_fh *src_fh,
struct inode *r_ino = NULL;
struct nfs_open_context *ctx;
struct nfs4_state_owner *sp;
- char *read_name;
+ char *read_name = NULL;
int len, status = 0;
server = NFS_SERVER(ss_mnt->mnt_root->d_inode);
@@ -342,14 +342,14 @@ nfs42_ssc_open(struct vfsmount *ss_mnt, struct nfs_fh *src_fh,
NULL);
if (IS_ERR(r_ino)) {
res = ERR_CAST(r_ino);
- goto out;
+ goto out_free_name;
}
filep = alloc_file_pseudo(r_ino, ss_mnt, read_name, FMODE_READ,
r_ino->i_fop);
if (IS_ERR(filep)) {
res = ERR_CAST(filep);
- goto out;
+ goto out_free_name;
}
filep->f_mode |= FMODE_READ;
@@ -380,6 +380,8 @@ nfs42_ssc_open(struct vfsmount *ss_mnt, struct nfs_fh *src_fh,
file_ra_state_init(&filep->f_ra, filep->f_mapping->host->i_mapping);
res = filep;
+out_free_name:
+ kfree(read_name);
out:
return res;
out_stateowner:
@@ -388,7 +390,7 @@ out_ctx:
put_nfs_open_context(ctx);
out_filep:
fput(filep);
- goto out;
+ goto out_free_name;
}
EXPORT_SYMBOL_GPL(nfs42_ssc_open);
void nfs42_ssc_close(struct file *filep)