SUNRPC: Ensure we exit early in case of an encode error

[cascardo/linux.git] / net / sunrpc / clnt.c

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 3ae5604..9503b4c 100644 (file)
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -43,7 +43,7 @@
 
 #define dprint_status(t)                                       \
        dprintk("RPC: %5u %s (status %d)\n", t->tk_pid,         \
-                       __FUNCTION__, t->tk_status)
+                       __func__, t->tk_status)
 
 /*
  * All RPC clients are linked into this list
@@ -261,10 +261,6 @@ struct rpc_clnt *rpc_create(struct rpc_create_args *args)
        };
        char servername[48];
 
-       xprt = xprt_create_transport(&xprtargs);
-       if (IS_ERR(xprt))
-               return (struct rpc_clnt *)xprt;
-
        /*
         * If the caller chooses not to specify a hostname, whip
         * up a string representation of the passed-in address.
@@ -372,7 +368,7 @@ out_no_path:
 out_no_stats:
        kfree(new);
 out_no_clnt:
-       dprintk("RPC:       %s: returned error %d\n", __FUNCTION__, err);
+       dprintk("RPC:       %s: returned error %d\n", __func__, err);
        return ERR_PTR(err);
 }
 EXPORT_SYMBOL_GPL(rpc_clone_client);
@@ -756,7 +752,7 @@ call_reserveresult(struct rpc_task *task)
                }
 
                printk(KERN_ERR "%s: status=%d, but no request slot, exiting\n",
-                               __FUNCTION__, status);
+                               __func__, status);
                rpc_exit(task, -EIO);
                return;
        }
@@ -767,7 +763,7 @@ call_reserveresult(struct rpc_task *task)
         */
        if (task->tk_rqstp) {
                printk(KERN_ERR "%s: status=%d, request allocated anyway\n",
-                               __FUNCTION__, status);
+                               __func__, status);
                xprt_release(task);
        }
 
@@ -779,7 +775,7 @@ call_reserveresult(struct rpc_task *task)
                break;
        default:
                printk(KERN_ERR "%s: unrecognized error %d, exiting\n",
-                               __FUNCTION__, status);
+                               __func__, status);
                break;
        }
        rpc_exit(task, status);
@@ -894,7 +890,6 @@ call_encode(struct rpc_task *task)
                        task->tk_msg.rpc_argp);
        if (task->tk_status == -ENOMEM) {
                /* XXX: Is this sane? */
-               rpc_delay(task, 3*HZ);
                task->tk_status = -EAGAIN;
        }
 }
@@ -1052,8 +1047,14 @@ call_transmit(struct rpc_task *task)
                BUG_ON(task->tk_rqstp->rq_bytes_sent != 0);
                call_encode(task);
                /* Did the encode result in an error condition? */
-               if (task->tk_status != 0)
+               if (task->tk_status != 0) {
+                       /* Was the error nonfatal? */
+                       if (task->tk_status == -EAGAIN)
+                               rpc_delay(task, HZ >> 4);
+                       else
+                               rpc_exit(task, task->tk_status);
                        return;
+               }
        }
        xprt_transmit(task);
        if (task->tk_status < 0)
@@ -1120,7 +1121,8 @@ call_status(struct rpc_task *task)
        case -ETIMEDOUT:
                task->tk_action = call_timeout;
                if (task->tk_client->cl_discrtry)
-                       xprt_force_disconnect(task->tk_xprt);
+                       xprt_conditional_disconnect(task->tk_xprt,
+                                       req->rq_connect_cookie);
                break;
        case -ECONNREFUSED:
        case -ENOTCONN:
@@ -1172,6 +1174,11 @@ call_timeout(struct rpc_task *task)
                        clnt->cl_protname, clnt->cl_server);
        }
        rpc_force_rebind(clnt);
+       /*
+        * Did our request time out due to an RPCSEC_GSS out-of-sequence
+        * event? RFC2203 requires the server to drop all such requests.
+        */
+       rpcauth_invalcred(task);
 
 retry:
        clnt->cl_stats->rpcretrans++;
@@ -1245,7 +1252,8 @@ out_retry:
        if (task->tk_rqstp == req) {
                req->rq_received = req->rq_rcv_buf.len = 0;
                if (task->tk_client->cl_discrtry)
-                       xprt_force_disconnect(task->tk_xprt);
+                       xprt_conditional_disconnect(task->tk_xprt,
+                                       req->rq_connect_cookie);
        }
 }
 
@@ -1330,7 +1338,7 @@ call_verify(struct rpc_task *task)
                 *   undefined results
                 */
                dprintk("RPC: %5u %s: XDR representation not a multiple of"
-                      " 4 bytes: 0x%x\n", task->tk_pid, __FUNCTION__,
+                      " 4 bytes: 0x%x\n", task->tk_pid, __func__,
                       task->tk_rqstp->rq_rcv_buf.len);
                goto out_eio;
        }
@@ -1340,7 +1348,7 @@ call_verify(struct rpc_task *task)
 
        if ((n = ntohl(*p++)) != RPC_REPLY) {
                dprintk("RPC: %5u %s: not an RPC reply: %x\n",
-                               task->tk_pid, __FUNCTION__, n);
+                               task->tk_pid, __func__, n);
                goto out_garbage;
        }
        if ((n = ntohl(*p++)) != RPC_MSG_ACCEPTED) {
@@ -1352,13 +1360,13 @@ call_verify(struct rpc_task *task)
                        case RPC_MISMATCH:
                                dprintk("RPC: %5u %s: RPC call version "
                                                "mismatch!\n",
-                                               task->tk_pid, __FUNCTION__);
+                                               task->tk_pid, __func__);
                                error = -EPROTONOSUPPORT;
                                goto out_err;
                        default:
                                dprintk("RPC: %5u %s: RPC call rejected, "
                                                "unknown error: %x\n",
-                                               task->tk_pid, __FUNCTION__, n);
+                                               task->tk_pid, __func__, n);
                                goto out_eio;
                }
                if (--len < 0)
@@ -1372,7 +1380,7 @@ call_verify(struct rpc_task *task)
                                break;
                        task->tk_cred_retry--;
                        dprintk("RPC: %5u %s: retry stale creds\n",
-                                       task->tk_pid, __FUNCTION__);
+                                       task->tk_pid, __func__);
                        rpcauth_invalcred(task);
                        /* Ensure we obtain a new XID! */
                        xprt_release(task);
@@ -1385,7 +1393,7 @@ call_verify(struct rpc_task *task)
                                break;
                        task->tk_garb_retry--;
                        dprintk("RPC: %5u %s: retry garbled creds\n",
-                                       task->tk_pid, __FUNCTION__);
+                                       task->tk_pid, __func__);
                        task->tk_action = call_bind;
                        goto out_retry;
                case RPC_AUTH_TOOWEAK:
@@ -1394,16 +1402,16 @@ call_verify(struct rpc_task *task)
                        break;
                default:
                        dprintk("RPC: %5u %s: unknown auth error: %x\n",
-                                       task->tk_pid, __FUNCTION__, n);
+                                       task->tk_pid, __func__, n);
                        error = -EIO;
                }
                dprintk("RPC: %5u %s: call rejected %d\n",
-                               task->tk_pid, __FUNCTION__, n);
+                               task->tk_pid, __func__, n);
                goto out_err;
        }
        if (!(p = rpcauth_checkverf(task, p))) {
                dprintk("RPC: %5u %s: auth check failed\n",
-                               task->tk_pid, __FUNCTION__);
+                               task->tk_pid, __func__);
                goto out_garbage;               /* bad verifier, retry */
        }
        len = p - (__be32 *)iov->iov_base - 1;
@@ -1414,14 +1422,14 @@ call_verify(struct rpc_task *task)
                return p;
        case RPC_PROG_UNAVAIL:
                dprintk("RPC: %5u %s: program %u is unsupported by server %s\n",
-                               task->tk_pid, __FUNCTION__,
+                               task->tk_pid, __func__,
                                (unsigned int)task->tk_client->cl_prog,
                                task->tk_client->cl_server);
                error = -EPFNOSUPPORT;
                goto out_err;
        case RPC_PROG_MISMATCH:
                dprintk("RPC: %5u %s: program %u, version %u unsupported by "
-                               "server %s\n", task->tk_pid, __FUNCTION__,
+                               "server %s\n", task->tk_pid, __func__,
                                (unsigned int)task->tk_client->cl_prog,
                                (unsigned int)task->tk_client->cl_vers,
                                task->tk_client->cl_server);
@@ -1430,7 +1438,7 @@ call_verify(struct rpc_task *task)
        case RPC_PROC_UNAVAIL:
                dprintk("RPC: %5u %s: proc %p unsupported by program %u, "
                                "version %u on server %s\n",
-                               task->tk_pid, __FUNCTION__,
+                               task->tk_pid, __func__,
                                task->tk_msg.rpc_proc,
                                task->tk_client->cl_prog,
                                task->tk_client->cl_vers,
@@ -1439,11 +1447,11 @@ call_verify(struct rpc_task *task)
                goto out_err;
        case RPC_GARBAGE_ARGS:
                dprintk("RPC: %5u %s: server saw garbage\n",
-                               task->tk_pid, __FUNCTION__);
+                               task->tk_pid, __func__);
                break;                  /* retry */
        default:
                dprintk("RPC: %5u %s: server accept status: %x\n",
-                               task->tk_pid, __FUNCTION__, n);
+                               task->tk_pid, __func__, n);
                /* Also retry */
        }
 
@@ -1452,7 +1460,7 @@ out_garbage:
        if (task->tk_garb_retry) {
                task->tk_garb_retry--;
                dprintk("RPC: %5u %s: retrying\n",
-                               task->tk_pid, __FUNCTION__);
+                               task->tk_pid, __func__);
                task->tk_action = call_bind;
 out_retry:
                return ERR_PTR(-EAGAIN);
@@ -1462,11 +1470,11 @@ out_eio:
 out_err:
        rpc_exit(task, error);
        dprintk("RPC: %5u %s: call failed with error %d\n", task->tk_pid,
-                       __FUNCTION__, error);
+                       __func__, error);
        return ERR_PTR(error);
 out_overflow:
        dprintk("RPC: %5u %s: server reply was truncated.\n", task->tk_pid,
-                       __FUNCTION__);
+                       __func__);
        goto out_garbage;
 }