2 files changed, 46 insertions, 13 deletions

diff --git a/net/sunrpc/xprtrdma/svc_rdma_marshal.c b/net/sunrpc/xprtrdma/svc_rdma_marshal.c
index b9ce01f6af90..765bca47c74d 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_marshal.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_marshal.c
@@ -148,22 +148,41 @@ static __be32 *decode_reply_array(__be32 *va, __be32 *vaend)
 int svc_rdma_xdr_decode_req(struct rpcrdma_msg *rmsgp, struct svc_rqst *rqstp)
 {
         __be32 *va, *vaend;
+        unsigned int len;
         u32 hdr_len;
 
         /* Verify that there's enough bytes for header + something */
-        if (rqstp->rq_arg.len <= RPCRDMA_HDRLEN_MIN) {
+        if (rqstp->rq_arg.len <= RPCRDMA_HDRLEN_ERR) {
                 dprintk("svcrdma: header too short = %d\n",
                         rqstp->rq_arg.len);
                 return -EINVAL;
         }
 
-        if (rmsgp->rm_vers != rpcrdma_version)
+        if (rmsgp->rm_vers != rpcrdma_version) {
+                dprintk("%s: bad version %u\n", __func__,
+                        be32_to_cpu(rmsgp->rm_vers));
                 return -EPROTONOSUPPORT;
+        }
 
-        /* Pull in the extra for the padded case and bump our pointer */
-        if (rmsgp->rm_type == rdma_msgp) {
-                int hdrlen;
-
+        switch (be32_to_cpu(rmsgp->rm_type)) {
+        case RDMA_MSG:
+        case RDMA_NOMSG:
+                break;
+
+        case RDMA_DONE:
+                /* Just drop it */
+                dprintk("svcrdma: dropping RDMA_DONE message\n");
+                return 0;
+
+        case RDMA_ERROR:
+                /* Possible if this is a backchannel reply.
+                 * XXX: We should cancel this XID, though.
+                 */
+                dprintk("svcrdma: dropping RDMA_ERROR message\n");
+                return 0;
+
+        case RDMA_MSGP:
+                /* Pull in the extra for the padded case, bump our pointer */
                 rmsgp->rm_body.rm_padded.rm_align =
                         be32_to_cpu(rmsgp->rm_body.rm_padded.rm_align);
                 rmsgp->rm_body.rm_padded.rm_thresh =
@@ -171,11 +190,15 @@ int svc_rdma_xdr_decode_req(struct rpcrdma_msg *rmsgp, struct svc_rqst *rqstp)
 
                 va = &rmsgp->rm_body.rm_padded.rm_pempty[4];
                 rqstp->rq_arg.head[0].iov_base = va;
-                hdrlen = (u32)((unsigned long)va - (unsigned long)rmsgp);
-                rqstp->rq_arg.head[0].iov_len -= hdrlen;
-                if (hdrlen > rqstp->rq_arg.len)
+                len = (u32)((unsigned long)va - (unsigned long)rmsgp);
+                rqstp->rq_arg.head[0].iov_len -= len;
+                if (len > rqstp->rq_arg.len)
                         return -EINVAL;
-                return hdrlen;
+                return len;
+        default:
+                dprintk("svcrdma: bad rdma procedure (%u)\n",
+                        be32_to_cpu(rmsgp->rm_type));
+                return -EINVAL;
         }
 
         /* The chunk list may contain either a read chunk list or a write
@@ -184,14 +207,20 @@ int svc_rdma_xdr_decode_req(struct rpcrdma_msg *rmsgp, struct svc_rqst *rqstp)
         va = &rmsgp->rm_body.rm_chunks[0];
         vaend = (__be32 *)((unsigned long)rmsgp + rqstp->rq_arg.len);
         va = decode_read_list(va, vaend);
-        if (!va)
+        if (!va) {
+                dprintk("svcrdma: failed to decode read list\n");
                 return -EINVAL;
+        }
         va = decode_write_list(va, vaend);
-        if (!va)
+        if (!va) {
+                dprintk("svcrdma: failed to decode write list\n");
                 return -EINVAL;
+        }
         va = decode_reply_array(va, vaend);
-        if (!va)
+        if (!va) {
+                dprintk("svcrdma: failed to decode reply chunk\n");
                 return -EINVAL;
+        }
 
         rqstp->rq_arg.head[0].iov_base = va;
         hdr_len = (unsigned long)va - (unsigned long)rmsgp;
diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
index 8f68cb6d89fe..f8b840b17c02 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
@@ -657,6 +657,8 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
         ret = svc_rdma_xdr_decode_req(rmsgp, rqstp);
         if (ret < 0)
                 goto out_err;
+        if (ret == 0)
+                goto out_drop;
         rqstp->rq_xprt_hlen = ret;
 
         if (svc_rdma_is_backchannel_reply(xprt, rmsgp)) {
@@ -710,6 +712,8 @@ out_err:
 defer:
         return 0;
 
+out_drop:
+        svc_rdma_put_context(ctxt, 1);
 repost:
         return svc_rdma_repost_recv(rdma_xprt, GFP_KERNEL);
 }