]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
nfsd: fix an IS_ERR() vs NULL check
authorDan Carpenter <dan.carpenter@oracle.com>
Fri, 4 Jan 2019 06:47:03 +0000 (09:47 +0300)
committerJ. Bruce Fields <bfields@redhat.com>
Wed, 6 Feb 2019 20:37:14 +0000 (15:37 -0500)
The get_backchannel_cred() used to return error pointers on error but
now it returns NULL pointers.

Fixes: 97f68c6b02e0 ("SUNRPC: add 'struct cred *' to auth_cred and rpc_cre")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
fs/nfsd/nfs4callback.c

index c74e4538d0ebe1e97536e7e7460228eb2580b152..9b38dab1c21ba3547592fb6d955aabe853ca3353 100644 (file)
@@ -913,9 +913,9 @@ static int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *c
                return PTR_ERR(client);
        }
        cred = get_backchannel_cred(clp, client, ses);
-       if (IS_ERR(cred)) {
+       if (!cred) {
                rpc_shutdown_client(client);
-               return PTR_ERR(cred);
+               return -ENOMEM;
        }
        clp->cl_cb_client = client;
        clp->cl_cb_cred = cred;