]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
NFS: Fix a potential NULL dereference in nfs_get_client()
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 3 Jun 2021 12:37:53 +0000 (15:37 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 16 Jun 2021 09:36:35 +0000 (11:36 +0200)
[ 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>
fs/nfs/client.c

index 28d8a57a9908ce7929c20ad8014cad495a871b72..d322ed5cbc1ca1447e327c60a558dd0201381d02 100644 (file)
@@ -379,7 +379,7 @@ nfs_get_client(const struct nfs_client_initdata *cl_init,
 
        if (cl_init->hostname == NULL) {
                WARN_ON(1);
-               return NULL;
+               return ERR_PTR(-EINVAL);
        }
 
        dprintk("--> nfs_get_client(%s,v%u)\n",