6 files changed, 117 insertions, 93 deletions

diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
index 7da7050f06c3..73940df6c460 100644
--- a/net/sunrpc/auth_gss/svcauth_gss.c
+++ b/net/sunrpc/auth_gss/svcauth_gss.c
@@ -631,7 +631,8 @@ svc_safe_putnetobj(struct kvec *resv, struct xdr_netobj *o)
         return 0;
 }
 
-/* Verify the checksum on the header and return SVC_OK on success.
+/*
+ * Verify the checksum on the header and return SVC_OK on success.
  * Otherwise, return SVC_DROP (in the case of a bad sequence number)
  * or return SVC_DENIED and indicate error in authp.
  */
@@ -961,6 +962,78 @@ gss_write_init_verf(struct svc_rqst *rqstp, struct rsi *rsip)
 }
 
 /*
+ * Having read the cred already and found we're in the context
+ * initiation case, read the verifier and initiate (or check the results
+ * of) upcalls to userspace for help with context initiation.  If
+ * the upcall results are available, write the verifier and result.
+ * Otherwise, drop the request pending an answer to the upcall.
+ */
+static int svcauth_gss_handle_init(struct svc_rqst *rqstp,
+                        struct rpc_gss_wire_cred *gc, __be32 *authp)
+{
+        struct kvec *argv = &rqstp->rq_arg.head[0];
+        struct kvec *resv = &rqstp->rq_res.head[0];
+        struct xdr_netobj tmpobj;
+        struct rsi *rsip, rsikey;
+
+        /* Read the verifier; should be NULL: */
+        *authp = rpc_autherr_badverf;
+        if (argv->iov_len < 2 * 4)
+                return SVC_DENIED;
+        if (svc_getnl(argv) != RPC_AUTH_NULL)
+                return SVC_DENIED;
+        if (svc_getnl(argv) != 0)
+                return SVC_DENIED;
+
+        /* Martial context handle and token for upcall: */
+        *authp = rpc_autherr_badcred;
+        if (gc->gc_proc == RPC_GSS_PROC_INIT && gc->gc_ctx.len != 0)
+                return SVC_DENIED;
+        memset(&rsikey, 0, sizeof(rsikey));
+        if (dup_netobj(&rsikey.in_handle, &gc->gc_ctx))
+                return SVC_DROP;
+        *authp = rpc_autherr_badverf;
+        if (svc_safe_getnetobj(argv, &tmpobj)) {
+                kfree(rsikey.in_handle.data);
+                return SVC_DENIED;
+        }
+        if (dup_netobj(&rsikey.in_token, &tmpobj)) {
+                kfree(rsikey.in_handle.data);
+                return SVC_DROP;
+        }
+
+        /* Perform upcall, or find upcall result: */
+        rsip = rsi_lookup(&rsikey);
+        rsi_free(&rsikey);
+        if (!rsip)
+                return SVC_DROP;
+        switch (cache_check(&rsi_cache, &rsip->h, &rqstp->rq_chandle)) {
+        case -EAGAIN:
+        case -ETIMEDOUT:
+        case -ENOENT:
+                /* No upcall result: */
+                return SVC_DROP;
+        case 0:
+                /* Got an answer to the upcall; use it: */
+                if (gss_write_init_verf(rqstp, rsip))
+                        return SVC_DROP;
+                if (resv->iov_len + 4 > PAGE_SIZE)
+                        return SVC_DROP;
+                svc_putnl(resv, RPC_SUCCESS);
+                if (svc_safe_putnetobj(resv, &rsip->out_handle))
+                        return SVC_DROP;
+                if (resv->iov_len + 3 * 4 > PAGE_SIZE)
+                        return SVC_DROP;
+                svc_putnl(resv, rsip->major_status);
+                svc_putnl(resv, rsip->minor_status);
+                svc_putnl(resv, GSS_SEQ_WIN);
+                if (svc_safe_putnetobj(resv, &rsip->out_token))
+                        return SVC_DROP;
+        }
+        return SVC_COMPLETE;
+}
+
+/*
  * Accept an rpcsec packet.
  * If context establishment, punt to user space
  * If data exchange, verify/decrypt
@@ -974,11 +1047,9 @@ svcauth_gss_accept(struct svc_rqst *rqstp, __be32 *authp)
         struct kvec     *argv = &rqstp->rq_arg.head[0];
         struct kvec     *resv = &rqstp->rq_res.head[0];
         u32             crlen;
-        struct xdr_netobj tmpobj;
         struct gss_svc_data *svcdata = rqstp->rq_auth_data;
         struct rpc_gss_wire_cred *gc;
         struct rsc      *rsci = NULL;
-        struct rsi      *rsip, rsikey;
         __be32          *rpcstart;
         __be32          *reject_stat = resv->iov_base + resv->iov_len;
         int             ret;
@@ -1023,30 +1094,14 @@ svcauth_gss_accept(struct svc_rqst *rqstp, __be32 *authp)
         if ((gc->gc_proc != RPC_GSS_PROC_DATA) && (rqstp->rq_proc != 0))
                 goto auth_err;
 
-        /*
-         * We've successfully parsed the credential. Let's check out the
-         * verifier.  An AUTH_NULL verifier is allowed (and required) for
-         * INIT and CONTINUE_INIT requests. AUTH_RPCSEC_GSS is required for
-         * PROC_DATA and PROC_DESTROY.
-         *
-         * AUTH_NULL verifier is 0 (AUTH_NULL), 0 (length).
-         * AUTH_RPCSEC_GSS verifier is:
-         *   6 (AUTH_RPCSEC_GSS), length, checksum.
-         * checksum is calculated over rpcheader from xid up to here.
-         */
         *authp = rpc_autherr_badverf;
         switch (gc->gc_proc) {
         case RPC_GSS_PROC_INIT:
         case RPC_GSS_PROC_CONTINUE_INIT:
-                if (argv->iov_len < 2 * 4)
-                        goto auth_err;
-                if (svc_getnl(argv) != RPC_AUTH_NULL)
-                        goto auth_err;
-                if (svc_getnl(argv) != 0)
-                        goto auth_err;
-                break;
+                return svcauth_gss_handle_init(rqstp, gc, authp);
         case RPC_GSS_PROC_DATA:
         case RPC_GSS_PROC_DESTROY:
+                /* Look up the context, and check the verifier: */
                 *authp = rpcsec_gsserr_credproblem;
                 rsci = gss_svc_searchbyctx(&gc->gc_ctx);
                 if (!rsci)
@@ -1067,51 +1122,6 @@ svcauth_gss_accept(struct svc_rqst *rqstp, __be32 *authp)
 
         /* now act upon the command: */
         switch (gc->gc_proc) {
-        case RPC_GSS_PROC_INIT:
-        case RPC_GSS_PROC_CONTINUE_INIT:
-                *authp = rpc_autherr_badcred;
-                if (gc->gc_proc == RPC_GSS_PROC_INIT && gc->gc_ctx.len != 0)
-                        goto auth_err;
-                memset(&rsikey, 0, sizeof(rsikey));
-                if (dup_netobj(&rsikey.in_handle, &gc->gc_ctx))
-                        goto drop;
-                *authp = rpc_autherr_badverf;
-                if (svc_safe_getnetobj(argv, &tmpobj)) {
-                        kfree(rsikey.in_handle.data);
-                        goto auth_err;
-                }
-                if (dup_netobj(&rsikey.in_token, &tmpobj)) {
-                        kfree(rsikey.in_handle.data);
-                        goto drop;
-                }
-
-                rsip = rsi_lookup(&rsikey);
-                rsi_free(&rsikey);
-                if (!rsip) {
-                        goto drop;
-                }
-                switch(cache_check(&rsi_cache, &rsip->h, &rqstp->rq_chandle)) {
-                case -EAGAIN:
-                case -ETIMEDOUT:
-                case -ENOENT:
-                        goto drop;
-                case 0:
-                        if (gss_write_init_verf(rqstp, rsip))
-                                goto drop;
-                        if (resv->iov_len + 4 > PAGE_SIZE)
-                                goto drop;
-                        svc_putnl(resv, RPC_SUCCESS);
-                        if (svc_safe_putnetobj(resv, &rsip->out_handle))
-                                goto drop;
-                        if (resv->iov_len + 3 * 4 > PAGE_SIZE)
-                                goto drop;
-                        svc_putnl(resv, rsip->major_status);
-                        svc_putnl(resv, rsip->minor_status);
-                        svc_putnl(resv, GSS_SEQ_WIN);
-                        if (svc_safe_putnetobj(resv, &rsip->out_token))
-                                goto drop;
-                }
-                goto complete;
         case RPC_GSS_PROC_DESTROY:
                 if (gss_write_verf(rqstp, rsci->mechctx, gc->gc_seq))
                         goto auth_err;
@@ -1158,7 +1168,7 @@ svcauth_gss_accept(struct svc_rqst *rqstp, __be32 *authp)
                 goto out;
         }
 auth_err:
-        /* Restore write pointer to original value: */
+        /* Restore write pointer to its original value: */
         xdr_ressize_check(rqstp, reject_stat);
         ret = SVC_DENIED;
         goto out;
diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
index ebe344f34d1a..8e05557414ce 100644
--- a/net/sunrpc/cache.c
+++ b/net/sunrpc/cache.c
@@ -1218,23 +1218,15 @@ static const struct seq_operations cache_content_op = {
 
 static int content_open(struct inode *inode, struct file *file)
 {
-        int res;
         struct handle *han;
         struct cache_detail *cd = PDE(inode)->data;
 
-        han = kmalloc(sizeof(*han), GFP_KERNEL);
+        han = __seq_open_private(file, &cache_content_op, sizeof(*han));
         if (han == NULL)
                 return -ENOMEM;
 
         han->cd = cd;
-
-        res = seq_open(file, &cache_content_op);
-        if (res)
-                kfree(han);
-        else
-                ((struct seq_file *)file->private_data)->private = han;
-
-        return res;
+        return 0;
 }
 
 static const struct file_operations content_file_operations = {
diff --git a/net/sunrpc/stats.c b/net/sunrpc/stats.c
index 74ba7d443dfc..4d4f3738b688 100644
--- a/net/sunrpc/stats.c
+++ b/net/sunrpc/stats.c
@@ -21,6 +21,7 @@
 #include <linux/sunrpc/clnt.h>
 #include <linux/sunrpc/svcsock.h>
 #include <linux/sunrpc/metrics.h>
+#include <net/net_namespace.h>
 
 #define RPCDBG_FACILITY RPCDBG_MISC
 
@@ -265,7 +266,7 @@ rpc_proc_init(void)
         dprintk("RPC:       registering /proc/net/rpc\n");
         if (!proc_net_rpc) {
                 struct proc_dir_entry *ent;
-                ent = proc_mkdir("rpc", proc_net);
+                ent = proc_mkdir("rpc", init_net.proc_net);
                 if (ent) {
                         ent->owner = THIS_MODULE;
                         proc_net_rpc = ent;
@@ -279,7 +280,7 @@ rpc_proc_exit(void)
         dprintk("RPC:       unregistering /proc/net/rpc\n");
         if (proc_net_rpc) {
                 proc_net_rpc = NULL;
-                remove_proc_entry("net/rpc", NULL);
+                remove_proc_entry("rpc", init_net.proc_net);
         }
 }
 
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index 55ea6df069de..a4a6bf7deaa4 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -777,6 +777,30 @@ svc_register(struct svc_serv *serv, int proto, unsigned short port)
 }
 
 /*
+ * Printk the given error with the address of the client that caused it.
+ */
+static int
+__attribute__ ((format (printf, 2, 3)))
+svc_printk(struct svc_rqst *rqstp, const char *fmt, ...)
+{
+        va_list args;
+        int     r;
+        char    buf[RPC_MAX_ADDRBUFLEN];
+
+        if (!net_ratelimit())
+                return 0;
+
+        printk(KERN_WARNING "svc: %s: ",
+                svc_print_addr(rqstp, buf, sizeof(buf)));
+
+        va_start(args, fmt);
+        r = vprintk(fmt, args);
+        va_end(args);
+
+        return r;
+}
+
+/*
  * Process the RPC request.
  */
 int
@@ -963,14 +987,13 @@ svc_process(struct svc_rqst *rqstp)
         return 0;
 
 err_short_len:
-        if (net_ratelimit())
-                printk("svc: short len %Zd, dropping request\n", argv->iov_len);
+        svc_printk(rqstp, "short len %Zd, dropping request\n",
+                        argv->iov_len);
 
         goto dropit;                    /* drop request */
 
 err_bad_dir:
-        if (net_ratelimit())
-                printk("svc: bad direction %d, dropping request\n", dir);
+        svc_printk(rqstp, "bad direction %d, dropping request\n", dir);
 
         serv->sv_stats->rpcbadfmt++;
         goto dropit;                    /* drop request */
@@ -1000,8 +1023,7 @@ err_bad_prog:
         goto sendit;
 
 err_bad_vers:
-        if (net_ratelimit())
-                printk("svc: unknown version (%d for prog %d, %s)\n",
+        svc_printk(rqstp, "unknown version (%d for prog %d, %s)\n",
                        vers, prog, progp->pg_name);
 
         serv->sv_stats->rpcbadfmt++;
@@ -1011,16 +1033,14 @@ err_bad_vers:
         goto sendit;
 
 err_bad_proc:
-        if (net_ratelimit())
-                printk("svc: unknown procedure (%d)\n", proc);
+        svc_printk(rqstp, "unknown procedure (%d)\n", proc);
 
         serv->sv_stats->rpcbadfmt++;
         svc_putnl(resv, RPC_PROC_UNAVAIL);
         goto sendit;
 
 err_garbage:
-        if (net_ratelimit())
-                printk("svc: failed to decode args\n");
+        svc_printk(rqstp, "failed to decode args\n");
 
         rpc_stat = rpc_garbage_args;
 err_bad:
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 036ab520df21..c75bffeb89eb 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -19,6 +19,7 @@
  * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
  */
 
+#include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/errno.h>
 #include <linux/fcntl.h>
@@ -103,7 +104,7 @@ static struct lock_class_key svc_slock_key[2];
 static inline void svc_reclassify_socket(struct socket *sock)
 {
         struct sock *sk = sock->sk;
-        BUG_ON(sk->sk_lock.owner != NULL);
+        BUG_ON(sock_owned_by_user(sk));
         switch (sk->sk_family) {
         case AF_INET:
                 sock_lock_init_class_and_name(sk, "slock-AF_INET-NFSD",
@@ -877,7 +878,7 @@ svc_udp_recvfrom(struct svc_rqst *rqstp)
         } else {
                 rqstp->rq_arg.page_len = len - rqstp->rq_arg.head[0].iov_len;
                 rqstp->rq_respages = rqstp->rq_pages + 1 +
-                        (rqstp->rq_arg.page_len + PAGE_SIZE - 1)/ PAGE_SIZE;
+                        DIV_ROUND_UP(rqstp->rq_arg.page_len, PAGE_SIZE);
         }
 
         if (serv->sv_stats)
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 6f32cc57f429..02298f529dad 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -1350,7 +1350,7 @@ static inline void xs_reclassify_socket4(struct socket *sock)
 {
         struct sock *sk = sock->sk;
 
-        BUG_ON(sk->sk_lock.owner != NULL);
+        BUG_ON(sock_owned_by_user(sk));
         sock_lock_init_class_and_name(sk, "slock-AF_INET-RPC",
                 &xs_slock_key[0], "sk_lock-AF_INET-RPC", &xs_key[0]);
 }
@@ -1359,7 +1359,7 @@ static inline void xs_reclassify_socket6(struct socket *sock)
 {
         struct sock *sk = sock->sk;
 
-        BUG_ON(sk->sk_lock.owner != NULL);
+        BUG_ON(sock_owned_by_user(sk));
         sock_lock_init_class_and_name(sk, "slock-AF_INET6-RPC",
                 &xs_slock_key[1], "sk_lock-AF_INET6-RPC", &xs_key[1]);
 }