Merge branch 'topic/asoc' into for-linus

[~andy/linux] / fs / nfs / callback.c

diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index 6a09760c5960fd427935c2306f5080caa66bce3b..3e634f2a1083cf556e9c3429320e0cd458d3c5b1 100644 (file)
--- a/fs/nfs/callback.c
+++ b/fs/nfs/callback.c
@@ -16,6 +16,7 @@
 #include <linux/mutex.h>
 #include <linux/freezer.h>
 #include <linux/kthread.h>
+#include <linux/sunrpc/svcauth_gss.h>
 
 #include <net/inet_sock.h>
 
@@ -40,6 +41,16 @@ unsigned short nfs_callback_tcpport;
 static const int nfs_set_port_min = 0;
 static const int nfs_set_port_max = 65535;
 
+/*
+ * If the kernel has IPv6 support available, always listen for
+ * both AF_INET and AF_INET6 requests.
+ */
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+static const sa_family_t       nfs_callback_family = AF_INET6;
+#else
+static const sa_family_t       nfs_callback_family = AF_INET;
+#endif
+
 static int param_set_port(const char *val, struct kernel_param *kp)
 {
        char *endp;
@@ -106,7 +117,7 @@ int nfs_callback_up(void)
        if (nfs_callback_info.users++ || nfs_callback_info.task != NULL)
                goto out;
        serv = svc_create(&nfs4_callback_program, NFS4_CALLBACK_BUFSIZE,
-                               AF_INET, NULL);
+                               nfs_callback_family, NULL);
        ret = -ENOMEM;
        if (!serv)
                goto out_err;
@@ -116,7 +127,8 @@ int nfs_callback_up(void)
        if (ret <= 0)
                goto out_err;
        nfs_callback_tcpport = ret;
-       dprintk("Callback port = 0x%x\n", nfs_callback_tcpport);
+       dprintk("NFS: Callback listener port = %u (af %u)\n",
+                       nfs_callback_tcpport, nfs_callback_family);
 
        nfs_callback_info.rqst = svc_prepare_thread(serv, &serv->sv_pools[0]);
        if (IS_ERR(nfs_callback_info.rqst)) {
@@ -149,8 +161,8 @@ out:
        mutex_unlock(&nfs_callback_mutex);
        return ret;
 out_err:
-       dprintk("Couldn't create callback socket or server thread; err = %d\n",
-               ret);
+       dprintk("NFS: Couldn't create callback socket or server thread; "
+               "err = %d\n", ret);
        nfs_callback_info.users--;
        goto out;
 }
@@ -171,10 +183,34 @@ void nfs_callback_down(void)
        mutex_unlock(&nfs_callback_mutex);
 }
 
+static int check_gss_callback_principal(struct nfs_client *clp,
+                                       struct svc_rqst *rqstp)
+{
+       struct rpc_clnt *r = clp->cl_rpcclient;
+       char *p = svc_gss_principal(rqstp);
+
+       /*
+        * It might just be a normal user principal, in which case
+        * userspace won't bother to tell us the name at all.
+        */
+       if (p == NULL)
+               return SVC_DENIED;
+
+       /* Expect a GSS_C_NT_HOSTBASED_NAME like "nfs@serverhostname" */
+
+       if (memcmp(p, "nfs@", 4) != 0)
+               return SVC_DENIED;
+       p += 4;
+       if (strcmp(p, r->cl_server) != 0)
+               return SVC_DENIED;
+       return SVC_OK;
+}
+
 static int nfs_callback_authenticate(struct svc_rqst *rqstp)
 {
        struct nfs_client *clp;
        RPC_IFDEBUG(char buf[RPC_MAX_ADDRBUFLEN]);
+       int ret = SVC_OK;
 
        /* Don't talk to strangers */
        clp = nfs_find_client(svc_addr(rqstp), 4);
@@ -183,21 +219,22 @@ static int nfs_callback_authenticate(struct svc_rqst *rqstp)
 
        dprintk("%s: %s NFSv4 callback!\n", __func__,
                        svc_print_addr(rqstp, buf, sizeof(buf)));
-       nfs_put_client(clp);
 
        switch (rqstp->rq_authop->flavour) {
                case RPC_AUTH_NULL:
                        if (rqstp->rq_proc != CB_NULL)
-                               return SVC_DENIED;
+                               ret = SVC_DENIED;
                        break;
                case RPC_AUTH_UNIX:
                        break;
                case RPC_AUTH_GSS:
-                       /* FIXME: RPCSEC_GSS handling? */
+                       ret = check_gss_callback_principal(clp, rqstp);
+                       break;
                default:
-                       return SVC_DENIED;
+                       ret = SVC_DENIED;
        }
-       return SVC_OK;
+       nfs_put_client(clp);
+       return ret;
 }
 
 /*