1 files changed, 5 insertions, 0 deletions

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 04f6e15457e0..b19bacf42564 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -959,6 +959,11 @@ call_bind_status(struct rpc_task *task)
         case -EACCES:
                 dprintk("RPC: %5u remote rpcbind: RPC program/version "
                                 "unavailable\n", task->tk_pid);
+                /* fail immediately if this is an RPC ping */
+                if (task->tk_msg.rpc_proc->p_proc == 0) {
+                        status = -EOPNOTSUPP;
+                        break;
+                }
                 rpc_delay(task, 3*HZ);
                 goto retry_timeout;
         case -ETIMEDOUT: