diff options
| author | Benjamin Coddington <bcodding@redhat.com> | 2019-06-11 12:57:52 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-04 09:30:54 +0200 |
| commit | afb5340f9438f15312de8dd5ef6de1960a30f74d (patch) | |
| tree | 9e6a24f12cc70287895dfd9fe3e1791bc963cbc3 /fs | |
| parent | 8edcabb2c2e9c3f8234718918c8808c79fd74aeb (diff) | |
| download | linux-stable-afb5340f9438f15312de8dd5ef6de1960a30f74d.tar.gz linux-stable-afb5340f9438f15312de8dd5ef6de1960a30f74d.tar.bz2 linux-stable-afb5340f9438f15312de8dd5ef6de1960a30f74d.zip | |
NFS: Cleanup if nfs_match_client is interrupted
commit 9f7761cf0409465075dadb875d5d4b8ef2f890c8 upstream.
Don't bail out before cleaning up a new allocation if the wait for
searching for a matching nfs client is interrupted. Memory leaks.
Reported-by: syzbot+7fe11b49c1cc30e3fce2@syzkaller.appspotmail.com
Fixes: 950a578c6128 ("NFS: make nfs_match_client killable")
Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/client.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/client.c b/fs/nfs/client.c index c092661147b3..0a2b59c1ecb3 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c @@ -416,10 +416,10 @@ struct nfs_client *nfs_get_client(const struct nfs_client_initdata *cl_init) clp = nfs_match_client(cl_init); if (clp) { spin_unlock(&nn->nfs_client_lock); - if (IS_ERR(clp)) - return clp; if (new) new->rpc_ops->free_client(new); + if (IS_ERR(clp)) + return clp; return nfs_found_client(cl_init, clp); } if (new) { |