summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2021-06-03 15:37:53 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-06-16 12:01:46 +0200
commit279ad78a00f8b9c5ff24171a59297187a3bd44b7 (patch)
treeaefdf019e46444386f79329e0d51d446e9295027
parent91f7fdc4cc10542ca1045c06aad23365f0d067e0 (diff)
downloadlinux-stable-279ad78a00f8b9c5ff24171a59297187a3bd44b7.tar.gz
linux-stable-279ad78a00f8b9c5ff24171a59297187a3bd44b7.tar.bz2
linux-stable-279ad78a00f8b9c5ff24171a59297187a3bd44b7.zip
NFS: Fix a potential NULL dereference in nfs_get_client()
[ Upstream commit 09226e8303beeec10f2ff844d2e46d1371dc58e0 ] None of the callers are expecting NULL returns from nfs_get_client() so this code will lead to an Oops. It's better to return an error pointer. I expect that this is dead code so hopefully no one is affected. Fixes: 31434f496abb ("nfs: check hostname in nfs_get_client") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--fs/nfs/client.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 4b8cc93913f7..723d425796cc 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -406,7 +406,7 @@ struct nfs_client *nfs_get_client(const struct nfs_client_initdata *cl_init)
if (cl_init->hostname == NULL) {
WARN_ON(1);
- return NULL;
+ return ERR_PTR(-EINVAL);
}
/* see if the client already exists */