1 files changed, 30 insertions, 26 deletions

diff --git a/net/sunrpc/auth_null.c b/net/sunrpc/auth_null.c
index d0ceac57c06e..41a633a4049e 100644
--- a/net/sunrpc/auth_null.c
+++ b/net/sunrpc/auth_null.c
@@ -59,15 +59,21 @@ nul_match(struct auth_cred *acred, struct rpc_cred *cred, int taskflags)
 /*
  * Marshal credential.
  */
-static __be32 *
-nul_marshal(struct rpc_task *task, __be32 *p)
+static int
+nul_marshal(struct rpc_task *task, struct xdr_stream *xdr)
 {
-        *p++ = htonl(RPC_AUTH_NULL);
-        *p++ = 0;
-        *p++ = htonl(RPC_AUTH_NULL);
-        *p++ = 0;
-
-        return p;
+        __be32 *p;
+
+        p = xdr_reserve_space(xdr, 4 * sizeof(*p));
+        if (!p)
+                return -EMSGSIZE;
+        /* Credential */
+        *p++ = rpc_auth_null;
+        *p++ = xdr_zero;
+        /* Verifier */
+        *p++ = rpc_auth_null;
+        *p   = xdr_zero;
+        return 0;
 }
 
 /*
@@ -80,25 +86,19 @@ nul_refresh(struct rpc_task *task)
         return 0;
 }
 
-static __be32 *
-nul_validate(struct rpc_task *task, __be32 *p)
+static int
+nul_validate(struct rpc_task *task, struct xdr_stream *xdr)
 {
-        rpc_authflavor_t        flavor;
-        u32                     size;
-
-        flavor = ntohl(*p++);
-        if (flavor != RPC_AUTH_NULL) {
-                printk("RPC: bad verf flavor: %u\n", flavor);
-                return ERR_PTR(-EIO);
-        }
-
-        size = ntohl(*p++);
-        if (size != 0) {
-                printk("RPC: bad verf size: %u\n", size);
-                return ERR_PTR(-EIO);
-        }
-
-        return p;
+        __be32 *p;
+
+        p = xdr_inline_decode(xdr, 2 * sizeof(*p));
+        if (!p)
+                return -EIO;
+        if (*p++ != rpc_auth_null)
+                return -EIO;
+        if (*p != xdr_zero)
+                return -EIO;
+        return 0;
 }
 
 const struct rpc_authops authnull_ops = {
@@ -114,6 +114,8 @@ static
 struct rpc_auth null_auth = {
         .au_cslack      = NUL_CALLSLACK,
         .au_rslack      = NUL_REPLYSLACK,
+        .au_verfsize    = NUL_REPLYSLACK,
+        .au_ralign      = NUL_REPLYSLACK,
         .au_ops         = &authnull_ops,
         .au_flavor      = RPC_AUTH_NULL,
         .au_count       = REFCOUNT_INIT(1),
@@ -125,8 +127,10 @@ const struct rpc_credops null_credops = {
         .crdestroy      = nul_destroy_cred,
         .crmatch        = nul_match,
         .crmarshal      = nul_marshal,
+        .crwrap_req     = rpcauth_wrap_req_encode,
         .crrefresh      = nul_refresh,
         .crvalidate     = nul_validate,
+        .crunwrap_resp  = rpcauth_unwrap_resp_decode,
 };
 
 static