Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afb5340f authored by Benjamin Coddington's avatar Benjamin Coddington Committed by Greg Kroah-Hartman
Browse files

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: default avatar <syzbot+7fe11b49c1cc30e3fce2@syzkaller.appspotmail.com>
Fixes: 950a578c6128 ("NFS: make nfs_match_client killable")
Signed-off-by: default avatarBenjamin Coddington <bcodding@redhat.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8edcabb2

fs/nfs/client.c

+2 −2
Original line number Diff line number Diff line
@@ -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) {