* [PATCH 0/6] gss-proxy upcall for nfsd
@ 2013-02-21 16:38 J. Bruce Fields
2013-02-21 16:38 ` [PATCH 1/6] SUNRPC: make AF_LOCAL connect synchronous J. Bruce Fields
` (5 more replies)
0 siblings, 6 replies; 21+ messages in thread
From: J. Bruce Fields @ 2013-02-21 16:38 UTC (permalink / raw)
To: linux-nfs; +Cc: Trond.Myklebust, chuck.lever, simo, J. Bruce Fields
From: "J. Bruce Fields" <bfields@redhat.com>
The following patches add support for rpc servers to use gss-proxy
instead of the existing cache-based method to accept new rpcsec_gss
contexts.
The existing cache-based upcall has some increasingly annoying
limitations that would be difficult to fix without incompatible changes,
and gss-proxy looks like a reasonable replacement.
Changes since Simo's last posting:
- All globals are made per-network-namespace.
- The new upcall is negotiated by write to a proc file instead
of a module parameter, allowing the choice to be made
per-container.
- We reuse a common per-network-namespace rpc client instead of
creating a new one for each upcall.
- Locking is relaxed to allow concurrent upcalls.
--b.
J. Bruce Fields (3):
SUNRPC: make AF_LOCAL connect synchronous
SUNRPC: attempt AF_LOCAL connect on setup
SUNRPC: no idle timeout for AF_LOCAL sockets
Simo Sorce (3):
SUNRPC: conditionally return endtime from import_sec_context
SUNRPC: Add RPC based upcall mechanism for RPCGSS auth
SUNRPC: Use gssproxy upcall for server RPCGSS authentication.
Documentation/filesystems/nfs/00-INDEX | 2 +
Documentation/filesystems/nfs/rpc-server-gss.txt | 91 +++
include/linux/sunrpc/gss_api.h | 2 +
net/sunrpc/auth_gss/Makefile | 3 +-
net/sunrpc/auth_gss/auth_gss.c | 2 +-
net/sunrpc/auth_gss/gss_krb5_mech.c | 7 +-
net/sunrpc/auth_gss/gss_mech_switch.c | 5 +-
net/sunrpc/auth_gss/gss_rpc_upcall.c | 360 +++++++++
net/sunrpc/auth_gss/gss_rpc_upcall.h | 47 ++
net/sunrpc/auth_gss/gss_rpc_xdr.c | 906 ++++++++++++++++++++++
net/sunrpc/auth_gss/gss_rpc_xdr.h | 269 +++++++
net/sunrpc/auth_gss/svcauth_gss.c | 350 ++++++++-
net/sunrpc/clnt.c | 1 +
net/sunrpc/netns.h | 6 +
net/sunrpc/xprtsock.c | 41 +-
15 files changed, 2067 insertions(+), 25 deletions(-)
create mode 100644 Documentation/filesystems/nfs/rpc-server-gss.txt
create mode 100644 net/sunrpc/auth_gss/gss_rpc_upcall.c
create mode 100644 net/sunrpc/auth_gss/gss_rpc_upcall.h
create mode 100644 net/sunrpc/auth_gss/gss_rpc_xdr.c
create mode 100644 net/sunrpc/auth_gss/gss_rpc_xdr.h
--
1.7.9.5
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH 1/6] SUNRPC: make AF_LOCAL connect synchronous
2013-02-21 16:38 [PATCH 0/6] gss-proxy upcall for nfsd J. Bruce Fields
@ 2013-02-21 16:38 ` J. Bruce Fields
2013-02-21 18:17 ` Myklebust, Trond
2013-02-21 16:38 ` [PATCH 2/6] SUNRPC: attempt AF_LOCAL connect on setup J. Bruce Fields
` (4 subsequent siblings)
5 siblings, 1 reply; 21+ messages in thread
From: J. Bruce Fields @ 2013-02-21 16:38 UTC (permalink / raw)
To: linux-nfs; +Cc: Trond.Myklebust, chuck.lever, simo, J. Bruce Fields
From: "J. Bruce Fields" <bfields@redhat.com>
It doesn't appear that anyone actually needs to connect asynchronously.
Also, using a workqueue for the connect means we lose the namespace
information from the original process. This is a problem since there's
no way to explicitly pass in a filesystem namespace for resolution of an
AF_LOCAL address.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
---
net/sunrpc/xprtsock.c | 35 +++++++++++++++++++++++++++--------
1 file changed, 27 insertions(+), 8 deletions(-)
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index bbc0915..b1df874 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -1866,13 +1866,9 @@ static int xs_local_finish_connecting(struct rpc_xprt *xprt,
* @xprt: RPC transport to connect
* @transport: socket transport to connect
* @create_sock: function to create a socket of the correct type
- *
- * Invoked by a work queue tasklet.
*/
-static void xs_local_setup_socket(struct work_struct *work)
+static void xs_local_setup_socket(struct sock_xprt *transport)
{
- struct sock_xprt *transport =
- container_of(work, struct sock_xprt, connect_worker.work);
struct rpc_xprt *xprt = &transport->xprt;
struct socket *sock;
int status = -EIO;
@@ -1919,6 +1915,31 @@ out:
current->flags &= ~PF_FSTRANS;
}
+static void xs_local_connect(struct rpc_task *task)
+{
+ struct rpc_xprt *xprt = task->tk_xprt;
+ struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);
+ unsigned long timeout;
+
+ if (RPC_IS_ASYNC(task))
+ rpc_exit(task, -ENOTCONN);
+
+ if (transport->sock != NULL && !RPC_IS_SOFTCONN(task)) {
+ dprintk("RPC: xs_connect delayed xprt %p for %lu "
+ "seconds\n",
+ xprt, xprt->reestablish_timeout / HZ);
+ timeout = xprt->reestablish_timeout;
+ xprt->reestablish_timeout <<= 1;
+ if (xprt->reestablish_timeout < XS_TCP_INIT_REEST_TO)
+ xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO;
+ if (xprt->reestablish_timeout > XS_TCP_MAX_REEST_TO)
+ xprt->reestablish_timeout = XS_TCP_MAX_REEST_TO;
+ rpc_delay(task, timeout);
+ } else
+ dprintk("RPC: xs_connect scheduled xprt %p\n", xprt);
+ xs_local_setup_socket(transport);
+}
+
#ifdef CONFIG_SUNRPC_SWAP
static void xs_set_memalloc(struct rpc_xprt *xprt)
{
@@ -2454,7 +2475,7 @@ static struct rpc_xprt_ops xs_local_ops = {
.alloc_slot = xprt_alloc_slot,
.rpcbind = xs_local_rpcbind,
.set_port = xs_local_set_port,
- .connect = xs_connect,
+ .connect = xs_local_connect,
.buf_alloc = rpc_malloc,
.buf_free = rpc_free,
.send_request = xs_local_send_request,
@@ -2627,8 +2648,6 @@ static struct rpc_xprt *xs_setup_local(struct xprt_create *args)
goto out_err;
}
xprt_set_bound(xprt);
- INIT_DELAYED_WORK(&transport->connect_worker,
- xs_local_setup_socket);
xs_format_peer_addresses(xprt, "local", RPCBIND_NETID_LOCAL);
break;
default:
--
1.7.9.5
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 2/6] SUNRPC: attempt AF_LOCAL connect on setup
2013-02-21 16:38 [PATCH 0/6] gss-proxy upcall for nfsd J. Bruce Fields
2013-02-21 16:38 ` [PATCH 1/6] SUNRPC: make AF_LOCAL connect synchronous J. Bruce Fields
@ 2013-02-21 16:38 ` J. Bruce Fields
2013-02-21 16:38 ` [PATCH 3/6] SUNRPC: no idle timeout for AF_LOCAL sockets J. Bruce Fields
` (3 subsequent siblings)
5 siblings, 0 replies; 21+ messages in thread
From: J. Bruce Fields @ 2013-02-21 16:38 UTC (permalink / raw)
To: linux-nfs; +Cc: Trond.Myklebust, chuck.lever, simo, J. Bruce Fields
From: "J. Bruce Fields" <bfields@redhat.com>
In the gss-proxy case, setup time is when I know I'll have the right
namespace for the connect.
In other cases, it might be useful to get any connection errors
earlier--though actually in practice it doesn't make any difference for
rpcbind.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
---
net/sunrpc/xprtsock.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index b1df874..f2cf652 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -1867,7 +1867,7 @@ static int xs_local_finish_connecting(struct rpc_xprt *xprt,
* @transport: socket transport to connect
* @create_sock: function to create a socket of the correct type
*/
-static void xs_local_setup_socket(struct sock_xprt *transport)
+static int xs_local_setup_socket(struct sock_xprt *transport)
{
struct rpc_xprt *xprt = &transport->xprt;
struct socket *sock;
@@ -1913,6 +1913,7 @@ out:
xprt_clear_connecting(xprt);
xprt_wake_pending_tasks(xprt, status);
current->flags &= ~PF_FSTRANS;
+ return status;
}
static void xs_local_connect(struct rpc_task *task)
@@ -2649,6 +2650,9 @@ static struct rpc_xprt *xs_setup_local(struct xprt_create *args)
}
xprt_set_bound(xprt);
xs_format_peer_addresses(xprt, "local", RPCBIND_NETID_LOCAL);
+ ret = ERR_PTR(xs_local_setup_socket(transport));
+ if (ret)
+ goto out_err;
break;
default:
ret = ERR_PTR(-EAFNOSUPPORT);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 3/6] SUNRPC: no idle timeout for AF_LOCAL sockets
2013-02-21 16:38 [PATCH 0/6] gss-proxy upcall for nfsd J. Bruce Fields
2013-02-21 16:38 ` [PATCH 1/6] SUNRPC: make AF_LOCAL connect synchronous J. Bruce Fields
2013-02-21 16:38 ` [PATCH 2/6] SUNRPC: attempt AF_LOCAL connect on setup J. Bruce Fields
@ 2013-02-21 16:38 ` J. Bruce Fields
2013-02-21 16:38 ` [PATCH 4/6] SUNRPC: conditionally return endtime from import_sec_context J. Bruce Fields
` (2 subsequent siblings)
5 siblings, 0 replies; 21+ messages in thread
From: J. Bruce Fields @ 2013-02-21 16:38 UTC (permalink / raw)
To: linux-nfs; +Cc: Trond.Myklebust, chuck.lever, simo, J. Bruce Fields
From: "J. Bruce Fields" <bfields@redhat.com>
In the gss-proxy case I don't want to have to reconnect at random--I
want to connect only on gss-proxy startup when I can steal gss-proxy's
context to do the connect in the right namespace.
And surely an AF_LOCAL socket isn't a ton of state to keep around--how
about we just turn off the idle timeout for AF_LOCAL sockets.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
---
net/sunrpc/xprtsock.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index f2cf652..a32227e 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -2635,7 +2635,7 @@ static struct rpc_xprt *xs_setup_local(struct xprt_create *args)
xprt->bind_timeout = XS_BIND_TO;
xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO;
- xprt->idle_timeout = XS_IDLE_DISC_TO;
+ xprt->idle_timeout = 0;
xprt->ops = &xs_local_ops;
xprt->timeout = &xs_local_default_timeout;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 4/6] SUNRPC: conditionally return endtime from import_sec_context
2013-02-21 16:38 [PATCH 0/6] gss-proxy upcall for nfsd J. Bruce Fields
` (2 preceding siblings ...)
2013-02-21 16:38 ` [PATCH 3/6] SUNRPC: no idle timeout for AF_LOCAL sockets J. Bruce Fields
@ 2013-02-21 16:38 ` J. Bruce Fields
2013-02-21 16:38 ` [PATCH 5/6] SUNRPC: Add RPC based upcall mechanism for RPCGSS auth J. Bruce Fields
2013-02-21 16:38 ` [PATCH 6/6] SUNRPC: Use gssproxy upcall for server RPCGSS authentication J. Bruce Fields
5 siblings, 0 replies; 21+ messages in thread
From: J. Bruce Fields @ 2013-02-21 16:38 UTC (permalink / raw)
To: linux-nfs; +Cc: Trond.Myklebust, chuck.lever, simo, J. Bruce Fields
From: Simo Sorce <simo@redhat.com>
We expose this parameter for a future caller.
It will be used to extract the endtime from the gss-proxy upcall mechanism,
in order to set the rsc cache expiration time.
Signed-off-by: Simo Sorce <simo@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
---
include/linux/sunrpc/gss_api.h | 2 ++
net/sunrpc/auth_gss/auth_gss.c | 2 +-
net/sunrpc/auth_gss/gss_krb5_mech.c | 7 +++++--
net/sunrpc/auth_gss/gss_mech_switch.c | 5 +++--
net/sunrpc/auth_gss/svcauth_gss.c | 3 ++-
5 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/include/linux/sunrpc/gss_api.h b/include/linux/sunrpc/gss_api.h
index a19e254..04d03bb 100644
--- a/include/linux/sunrpc/gss_api.h
+++ b/include/linux/sunrpc/gss_api.h
@@ -37,6 +37,7 @@ int gss_import_sec_context(
size_t bufsize,
struct gss_api_mech *mech,
struct gss_ctx **ctx_id,
+ time_t *endtime,
gfp_t gfp_mask);
u32 gss_get_mic(
struct gss_ctx *ctx_id,
@@ -92,6 +93,7 @@ struct gss_api_ops {
const void *input_token,
size_t bufsize,
struct gss_ctx *ctx_id,
+ time_t *endtime,
gfp_t gfp_mask);
u32 (*gss_get_mic)(
struct gss_ctx *ctx_id,
diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
index 6e5c824..7edfda5 100644
--- a/net/sunrpc/auth_gss/auth_gss.c
+++ b/net/sunrpc/auth_gss/auth_gss.c
@@ -238,7 +238,7 @@ gss_fill_context(const void *p, const void *end, struct gss_cl_ctx *ctx, struct
p = ERR_PTR(-EFAULT);
goto err;
}
- ret = gss_import_sec_context(p, seclen, gm, &ctx->gc_gss_ctx, GFP_NOFS);
+ ret = gss_import_sec_context(p, seclen, gm, &ctx->gc_gss_ctx, NULL, GFP_NOFS);
if (ret < 0) {
p = ERR_PTR(ret);
goto err;
diff --git a/net/sunrpc/auth_gss/gss_krb5_mech.c b/net/sunrpc/auth_gss/gss_krb5_mech.c
index d3611f1..3bc4a23 100644
--- a/net/sunrpc/auth_gss/gss_krb5_mech.c
+++ b/net/sunrpc/auth_gss/gss_krb5_mech.c
@@ -679,6 +679,7 @@ out_err:
static int
gss_import_sec_context_kerberos(const void *p, size_t len,
struct gss_ctx *ctx_id,
+ time_t *endtime,
gfp_t gfp_mask)
{
const void *end = (const void *)((const char *)p + len);
@@ -694,9 +695,11 @@ gss_import_sec_context_kerberos(const void *p, size_t len,
else
ret = gss_import_v2_context(p, end, ctx, gfp_mask);
- if (ret == 0)
+ if (ret == 0) {
ctx_id->internal_ctx_id = ctx;
- else
+ if (endtime)
+ *endtime = ctx->endtime;
+ } else
kfree(ctx);
dprintk("RPC: %s: returning %d\n", __func__, ret);
diff --git a/net/sunrpc/auth_gss/gss_mech_switch.c b/net/sunrpc/auth_gss/gss_mech_switch.c
index b174fcd..cfed709 100644
--- a/net/sunrpc/auth_gss/gss_mech_switch.c
+++ b/net/sunrpc/auth_gss/gss_mech_switch.c
@@ -325,14 +325,15 @@ int
gss_import_sec_context(const void *input_token, size_t bufsize,
struct gss_api_mech *mech,
struct gss_ctx **ctx_id,
+ time_t *endtime,
gfp_t gfp_mask)
{
if (!(*ctx_id = kzalloc(sizeof(**ctx_id), gfp_mask)))
return -ENOMEM;
(*ctx_id)->mech_type = gss_mech_get(mech);
- return mech->gm_ops
- ->gss_import_sec_context(input_token, bufsize, *ctx_id, gfp_mask);
+ return mech->gm_ops->gss_import_sec_context(input_token, bufsize,
+ *ctx_id, endtime, gfp_mask);
}
/* gss_get_mic: compute a mic over message and return mic_token. */
diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
index eb2b1f7..8fff637 100644
--- a/net/sunrpc/auth_gss/svcauth_gss.c
+++ b/net/sunrpc/auth_gss/svcauth_gss.c
@@ -485,7 +485,8 @@ static int rsc_parse(struct cache_detail *cd,
len = qword_get(&mesg, buf, mlen);
if (len < 0)
goto out;
- status = gss_import_sec_context(buf, len, gm, &rsci.mechctx, GFP_KERNEL);
+ status = gss_import_sec_context(buf, len, gm, &rsci.mechctx,
+ NULL, GFP_KERNEL);
if (status)
goto out;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 5/6] SUNRPC: Add RPC based upcall mechanism for RPCGSS auth
2013-02-21 16:38 [PATCH 0/6] gss-proxy upcall for nfsd J. Bruce Fields
` (3 preceding siblings ...)
2013-02-21 16:38 ` [PATCH 4/6] SUNRPC: conditionally return endtime from import_sec_context J. Bruce Fields
@ 2013-02-21 16:38 ` J. Bruce Fields
2013-02-21 18:35 ` Myklebust, Trond
2013-02-21 16:38 ` [PATCH 6/6] SUNRPC: Use gssproxy upcall for server RPCGSS authentication J. Bruce Fields
5 siblings, 1 reply; 21+ messages in thread
From: J. Bruce Fields @ 2013-02-21 16:38 UTC (permalink / raw)
To: linux-nfs; +Cc: Trond.Myklebust, chuck.lever, simo, J. Bruce Fields
From: Simo Sorce <simo@redhat.com>
This patch implements a sunrpc client to use the services of the gssproxy
userspace daemon.
In particular it allows to perform calls in user space using an RPC
call instead of custom hand-coded upcall/downcall messages.
Currently only accept_sec_context is implemented as that is all is needed for
the server case.
File server modules like NFS and CIFS can use full gssapi services this way,
once init_sec_context is also implemented.
For the NFS server case this code allow to lift the limit of max 2k krb5
tickets. This limit is prevents legitimate kerberos deployments from using krb5
authentication with the Linux NFS server as they have normally ticket that are
many kilobytes large.
It will also allow to lift the limitation on the size of the credential set
(uid,gid,gids) passed down from user space for users that have very many groups
associated. Currently the downcall mechanism used by rpc.svcgssd is limited
to around 2k secondary groups of the 65k allowed by kernel structures.
Signed-off-by: Simo Sorce <simo@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
---
net/sunrpc/auth_gss/Makefile | 3 +-
net/sunrpc/auth_gss/gss_rpc_upcall.c | 353 +++++++++++++
net/sunrpc/auth_gss/gss_rpc_upcall.h | 43 ++
net/sunrpc/auth_gss/gss_rpc_xdr.c | 906 ++++++++++++++++++++++++++++++++++
net/sunrpc/auth_gss/gss_rpc_xdr.h | 269 ++++++++++
5 files changed, 1573 insertions(+), 1 deletion(-)
create mode 100644 net/sunrpc/auth_gss/gss_rpc_upcall.c
create mode 100644 net/sunrpc/auth_gss/gss_rpc_upcall.h
create mode 100644 net/sunrpc/auth_gss/gss_rpc_xdr.c
create mode 100644 net/sunrpc/auth_gss/gss_rpc_xdr.h
diff --git a/net/sunrpc/auth_gss/Makefile b/net/sunrpc/auth_gss/Makefile
index 9e4cb59..14e9e53 100644
--- a/net/sunrpc/auth_gss/Makefile
+++ b/net/sunrpc/auth_gss/Makefile
@@ -5,7 +5,8 @@
obj-$(CONFIG_SUNRPC_GSS) += auth_rpcgss.o
auth_rpcgss-y := auth_gss.o gss_generic_token.o \
- gss_mech_switch.o svcauth_gss.o
+ gss_mech_switch.o svcauth_gss.o \
+ gss_rpc_upcall.o gss_rpc_xdr.o
obj-$(CONFIG_RPCSEC_GSS_KRB5) += rpcsec_gss_krb5.o
diff --git a/net/sunrpc/auth_gss/gss_rpc_upcall.c b/net/sunrpc/auth_gss/gss_rpc_upcall.c
new file mode 100644
index 0000000..5fd8c91
--- /dev/null
+++ b/net/sunrpc/auth_gss/gss_rpc_upcall.c
@@ -0,0 +1,353 @@
+/*
+ * linux/net/sunrpc/gss_rpc_upcall.c
+ *
+ * Copyright (C) 2012 Simo Sorce <simo@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/types.h>
+#include <linux/un.h>
+
+#include <linux/sunrpc/svcauth.h>
+#include "gss_rpc_upcall.h"
+
+#define GSSPROXY_SOCK_PATHNAME "/var/run/gssproxy.sock"
+
+#define GSSPROXY_PROGRAM (400112u)
+#define GSSPROXY_VERS_1 (1u)
+
+DEFINE_MUTEX(gssp_clnt_mutex);
+struct rpc_clnt *gssp_clnt;
+
+/*
+ * Encoding/Decoding functions
+ */
+
+enum {
+ GSSX_NULL = 0, /* Unused */
+ GSSX_INDICATE_MECHS = 1,
+ GSSX_GET_CALL_CONTEXT = 2,
+ GSSX_IMPORT_AND_CANON_NAME = 3,
+ GSSX_EXPORT_CRED = 4,
+ GSSX_IMPORT_CRED = 5,
+ GSSX_ACQUIRE_CRED = 6,
+ GSSX_STORE_CRED = 7,
+ GSSX_INIT_SEC_CONTEXT = 8,
+ GSSX_ACCEPT_SEC_CONTEXT = 9,
+ GSSX_RELEASE_HANDLE = 10,
+ GSSX_GET_MIC = 11,
+ GSSX_VERIFY = 12,
+ GSSX_WRAP = 13,
+ GSSX_UNWRAP = 14,
+ GSSX_WRAP_SIZE_LIMIT = 15,
+};
+
+#define PROC(proc, name) \
+[GSSX_##proc] = { \
+ .p_proc = GSSX_##proc, \
+ .p_encode = (kxdreproc_t)gssx_enc_##name, \
+ .p_decode = (kxdrdproc_t)gssx_dec_##name, \
+ .p_arglen = GSSX_ARG_##name##_sz, \
+ .p_replen = GSSX_RES_##name##_sz, \
+ .p_statidx = GSSX_##proc, \
+ .p_name = #proc, \
+}
+
+struct rpc_procinfo gssp_procedures[] = {
+ PROC(INDICATE_MECHS, indicate_mechs),
+ PROC(GET_CALL_CONTEXT, get_call_context),
+ PROC(IMPORT_AND_CANON_NAME, import_and_canon_name),
+ PROC(EXPORT_CRED, export_cred),
+ PROC(IMPORT_CRED, import_cred),
+ PROC(ACQUIRE_CRED, acquire_cred),
+ PROC(STORE_CRED, store_cred),
+ PROC(INIT_SEC_CONTEXT, init_sec_context),
+ PROC(ACCEPT_SEC_CONTEXT, accept_sec_context),
+ PROC(RELEASE_HANDLE, release_handle),
+ PROC(GET_MIC, get_mic),
+ PROC(VERIFY, verify),
+ PROC(WRAP, wrap),
+ PROC(UNWRAP, unwrap),
+ PROC(WRAP_SIZE_LIMIT, wrap_size_limit),
+};
+
+
+
+/*
+ * Common transport functions
+ */
+
+static const struct rpc_program gssp_program;
+
+static int gssp_rpc_create(struct net *net, struct rpc_clnt **_clnt)
+{
+ static const struct sockaddr_un gssp_localaddr = {
+ .sun_family = AF_LOCAL,
+ .sun_path = GSSPROXY_SOCK_PATHNAME,
+ };
+ struct rpc_create_args args = {
+ .net = net,
+ .protocol = XPRT_TRANSPORT_LOCAL,
+ .address = (struct sockaddr *)&gssp_localaddr,
+ .addrsize = sizeof(gssp_localaddr),
+ .servername = "localhost",
+ .program = &gssp_program,
+ .version = GSSPROXY_VERS_1,
+ .authflavor = RPC_AUTH_NULL,
+ .flags = RPC_CLNT_CREATE_NOPING,
+ };
+ struct rpc_clnt *clnt;
+ int result = 0;
+
+ clnt = rpc_create(&args);
+ if (IS_ERR(clnt)) {
+ dprintk("RPC: failed to create AF_LOCAL gssproxy "
+ "client (errno %ld).\n", PTR_ERR(clnt));
+ result = -PTR_ERR(clnt);
+ *_clnt = NULL;
+ goto out;
+ }
+
+ dprintk("RPC: created new gssp local client (gssp_local_clnt: "
+ "%p)\n", clnt);
+ *_clnt = clnt;
+
+out:
+ return result;
+}
+
+static struct rpc_clnt *get_clnt(struct net *net, bool global_clnt)
+{
+ struct rpc_clnt *clnt;
+ int err;
+
+ mutex_lock(&gssp_clnt_mutex);
+
+ if (global_clnt && gssp_clnt)
+ return gssp_clnt;
+
+ err = gssp_rpc_create(net, &clnt);
+ if (err) {
+ mutex_unlock(&gssp_clnt_mutex);
+ return NULL;
+ }
+ if (global_clnt)
+ gssp_clnt = clnt;
+
+ mutex_unlock(&gssp_clnt_mutex);
+ return clnt;
+}
+
+static void kill_clnt(struct rpc_clnt *clnt)
+{
+ BUG_ON(clnt == NULL);
+
+ mutex_lock(&gssp_clnt_mutex);
+
+ rpc_shutdown_client(clnt);
+ if (clnt == gssp_clnt)
+ gssp_clnt = NULL;
+
+ mutex_unlock(&gssp_clnt_mutex);
+}
+
+static int gssp_call(struct net *net, struct rpc_message *msg)
+{
+ struct rpc_clnt *clnt;
+ int status;
+
+ /* for now always create new one */
+ clnt = get_clnt(net, false);
+
+ status = rpc_call_sync(clnt, msg, 0);
+ if (status < 0) {
+ dprintk("gssp: rpc_call returned error %d\n", -status);
+ switch (status) {
+ case -EPROTONOSUPPORT:
+ status = -EINVAL;
+ break;
+ case -ECONNREFUSED:
+ case -ETIMEDOUT:
+ case -ENOTCONN:
+ status = -EAGAIN;
+ break;
+ case -ERESTARTSYS:
+ if (signalled ())
+ status = -EINTR;
+ break;
+ default:
+ break;
+ }
+ }
+
+ /* always kill connection for now */
+ kill_clnt(clnt);
+
+ return status;
+}
+
+
+/*
+ * Public functions
+ */
+
+/* numbers somewhat arbitrary but large enough for current needs */
+#define GSSX_MAX_OUT_HANDLE 128
+#define GSSX_MAX_MECH_OID 16
+#define GSSX_MAX_SRC_PRINC 256
+#define GSSX_KMEMBUF (GSSX_max_output_handle_sz + \
+ GSSX_max_oid_sz + \
+ GSSX_max_princ_sz + \
+ sizeof(struct svc_cred))
+
+int gssp_accept_sec_context_upcall(struct net *net,
+ struct gssp_upcall_data *data)
+{
+ struct gssx_arg_accept_sec_context arg;
+ struct gssx_res_accept_sec_context res;
+ struct gssx_ctx ctxh;
+ struct gssx_ctx rctxh;
+ struct gssx_cred delegcred;
+ struct rpc_message msg = {
+ .rpc_proc = &gssp_procedures[GSSX_ACCEPT_SEC_CONTEXT],
+ .rpc_argp = &arg,
+ .rpc_resp = &res,
+ .rpc_cred = NULL, /* FIXME ? */
+ };
+ struct xdr_netobj client_name = { 0 , NULL };
+ int ret;
+
+ /* fill in arg */
+ memset(&arg, 0, sizeof(arg));
+ if (data->in_handle.len != 0) {
+ memset(&ctxh, 0, sizeof(ctxh));
+ arg.context_handle = &ctxh;
+ ctxh.state = data->in_handle;
+ }
+ arg.input_token = data->in_token;
+
+ /* use nfs/ for targ_name ? */
+
+ /* prepare res */
+ memset(&res, 0, sizeof(res));
+ memset(&rctxh, 0, sizeof(rctxh));
+ res.context_handle = &rctxh;
+
+ /* pass in the max length we expect for each of these
+ * buffers but let the xdr code kmalloc them */
+ rctxh.exported_context_token.len = GSSX_max_output_handle_sz;
+ rctxh.mech.len = GSSX_max_oid_sz;
+ rctxh.src_name.display_name.len = GSSX_max_princ_sz;
+
+ res.output_token = &data->out_token;
+ res.output_token->len = GSSX_max_output_token_sz;
+
+ /* we are never interested in delegated credentials */
+ memset(&delegcred, 0, sizeof(delegcred));
+ res.delegated_cred_handle = &delegcred;
+
+ /* make upcall */
+ ret = gssp_call(net, &msg);
+
+ /* we need to fetch all data even in case of error so
+ * that we can free special strctures is they have been allocated */
+ data->major_status = res.status.major_status;
+ data->minor_status = res.status.minor_status;
+ if (res.context_handle) {
+ data->out_handle = rctxh.exported_context_token;
+ data->mech_oid = rctxh.mech;
+ client_name = rctxh.src_name.display_name;
+ }
+
+ if (res.options.count == 1) {
+ gssx_buffer *value = &res.options.data[0].value;
+ /* Currently we only decode CREDS_VALUE, if we add
+ * anything else we'll have to loop and match on the
+ * option name */
+ if (value->len == 1) {
+ /* steal group info from struct svc_cred */
+ data->creds = *(struct svc_cred *)value->data;
+ data->found_creds = 1;
+ }
+ /* whether we use it or not, free data */
+ kfree(value->data);
+ }
+
+ if (res.options.count != 0) {
+ kfree(res.options.data);
+ }
+
+ /* convert to GSS_NT_HOSTBASED_SERVICE form and set into creds */
+ if (data->found_creds && client_name.data != NULL) {
+ char *c;
+
+ data->creds.cr_principal = kstrndup(client_name.data,
+ client_name.len, GFP_KERNEL);
+ if (data->creds.cr_principal) {
+ /* terminate and remove realm part */
+ c = strchr(data->creds.cr_principal, '@');
+ if (c) {
+ *c = '\0';
+
+ /* change service-hostname delimiter */
+ c = strchr(data->creds.cr_principal, '/');
+ if (c) *c = '@';
+ }
+ if (!c) {
+ /* not a service principal */
+ kfree(data->creds.cr_principal);
+ data->creds.cr_principal = NULL;
+ }
+ }
+ }
+ kfree(client_name.data);
+
+ return ret;
+}
+
+void gssp_free_upcall_data(struct gssp_upcall_data *data)
+{
+ kfree(data->in_handle.data);
+ kfree(data->out_handle.data);
+ kfree(data->out_token.data);
+ kfree(data->mech_oid.data);
+ free_svc_cred(&data->creds);
+}
+
+/*
+ * Initialization stuff
+ */
+
+static const struct rpc_version gssp_version1 = {
+ .number = GSSPROXY_VERS_1,
+ .nrprocs = ARRAY_SIZE(gssp_procedures),
+ .procs = gssp_procedures,
+};
+
+static const struct rpc_version *gssp_version[] = {
+ NULL,
+ &gssp_version1,
+};
+
+static struct rpc_stat gssp_stats;
+
+static const struct rpc_program gssp_program = {
+ .name = "gssproxy",
+ .number = GSSPROXY_PROGRAM,
+ .nrvers = ARRAY_SIZE(gssp_version),
+ .version = gssp_version,
+ .stats = &gssp_stats,
+};
diff --git a/net/sunrpc/auth_gss/gss_rpc_upcall.h b/net/sunrpc/auth_gss/gss_rpc_upcall.h
new file mode 100644
index 0000000..83aca5a
--- /dev/null
+++ b/net/sunrpc/auth_gss/gss_rpc_upcall.h
@@ -0,0 +1,43 @@
+/*
+ * linux/net/sunrpc/gss_rpc_upcall.h
+ *
+ * Copyright (C) 2012 Simo Sorce <simo@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef _GSS_RPC_UPCALL_H
+#define _GSS_RPC_UPCALL_H
+
+#include <linux/sunrpc/auth_gss.h>
+#include "gss_rpc_xdr.h"
+
+struct gssp_upcall_data {
+ struct xdr_netobj in_handle;
+ struct gssp_in_token in_token;
+ struct xdr_netobj out_handle;
+ struct xdr_netobj out_token;
+ struct xdr_netobj mech_oid;
+ struct svc_cred creds;
+ int found_creds;
+ int major_status;
+ int minor_status;
+};
+
+int gssp_accept_sec_context_upcall(struct net *net,
+ struct gssp_upcall_data *data);
+void gssp_free_upcall_data(struct gssp_upcall_data *data);
+
+#endif /* _GSS_RPC_UPCALL_H */
diff --git a/net/sunrpc/auth_gss/gss_rpc_xdr.c b/net/sunrpc/auth_gss/gss_rpc_xdr.c
new file mode 100644
index 0000000..490c80b
--- /dev/null
+++ b/net/sunrpc/auth_gss/gss_rpc_xdr.c
@@ -0,0 +1,906 @@
+/*
+ * GSS Proxy upcall module
+ *
+ * Copyright (C) 2012 Simo Sorce <simo@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/sunrpc/svcauth.h>
+#include "gss_rpc_xdr.h"
+
+static bool gssx_check_pointer(struct xdr_stream *xdr)
+{
+ __be32 *p;
+
+ p = xdr_reserve_space(xdr, 4);
+ if (unlikely(p == NULL))
+ return -ENOSPC;
+ return *p?true:false;
+}
+
+static int gssx_enc_bool(struct xdr_stream *xdr, int v)
+{
+ __be32 *p;
+
+ p = xdr_reserve_space(xdr, 4);
+ if (unlikely(p == NULL))
+ return -ENOSPC;
+ *p = v ? xdr_one : xdr_zero;
+ return 0;
+}
+
+static int gssx_dec_bool(struct xdr_stream *xdr, u32 *v)
+{
+ __be32 *p;
+
+ p = xdr_inline_decode(xdr, 4);
+ if (unlikely(p == NULL))
+ return -ENOSPC;
+ *v = be32_to_cpu(*p);
+ return 0;
+}
+
+static int gssx_enc_buffer(struct xdr_stream *xdr,
+ gssx_buffer *buf)
+{
+ __be32 *p;
+
+ p = xdr_reserve_space(xdr, sizeof(u32) + buf->len);
+ if (!p)
+ return -ENOSPC;
+ xdr_encode_opaque(p, buf->data, buf->len);
+ return 0;
+}
+
+static int gssx_enc_in_token(struct xdr_stream *xdr,
+ struct gssp_in_token *in)
+{
+ __be32 *p;
+
+ p = xdr_reserve_space(xdr, 4);
+ if (!p)
+ return -ENOSPC;
+ *p = cpu_to_be32(in->page_len);
+
+ /* all we need to do is to write pages */
+ xdr_write_pages(xdr, in->pages, in->page_base, in->page_len);
+
+ return 0;
+}
+
+
+static int gssx_dec_buffer(struct xdr_stream *xdr,
+ gssx_buffer *buf)
+{
+ u32 length;
+ __be32 *p;
+
+ p = xdr_inline_decode(xdr, 4);
+ if (unlikely(p == NULL))
+ return -ENOSPC;
+
+ length = be32_to_cpup(p);
+ p = xdr_inline_decode(xdr, length);
+ if (unlikely(p == NULL))
+ return -ENOSPC;
+
+ if (buf->len == 0) {
+ /* we intentionally are not interested in this buffer */
+ return 0;
+ }
+ if (length > buf->len)
+ return -ENOSPC;
+
+ if (!buf->data) {
+ buf->data = kmemdup(p, length, GFP_KERNEL);
+ if (!buf->data)
+ return -ENOMEM;
+ } else {
+ memcpy(buf->data, p, length);
+ }
+ buf->len = length;
+ return 0;
+}
+
+static int gssx_enc_option(struct xdr_stream *xdr,
+ struct gssx_option *opt)
+{
+ int err;
+
+ err = gssx_enc_buffer(xdr, &opt->option);
+ if (err)
+ return err;
+ err = gssx_enc_buffer(xdr, &opt->value);
+ return err;
+}
+
+static int gssx_dec_option(struct xdr_stream *xdr,
+ struct gssx_option *opt)
+{
+ int err;
+
+ err = gssx_dec_buffer(xdr, &opt->option);
+ if (err)
+ return err;
+ err = gssx_dec_buffer(xdr, &opt->value);
+ return err;
+}
+
+static int dummy_enc_opt_array(struct xdr_stream *xdr,
+ struct gssx_option_array *oa)
+{
+ __be32 *p;
+
+ if (oa->count != 0)
+ return -EINVAL;
+
+ p = xdr_reserve_space(xdr, 4);
+ if (!p)
+ return -ENOSPC;
+ *p = 0;
+
+ return 0;
+}
+
+static int dummy_dec_opt_array(struct xdr_stream *xdr,
+ struct gssx_option_array *oa)
+{
+ struct gssx_option dummy;
+ u32 count, i;
+ __be32 *p;
+
+ p = xdr_inline_decode(xdr, 4);
+ if (unlikely(p == NULL))
+ return -ENOSPC;
+ count = be32_to_cpup(p++);
+ memset(&dummy, 0, sizeof(dummy));
+ for (i = 0; i < count; i++) {
+ gssx_dec_option(xdr, &dummy);
+ }
+
+ oa->count = 0;
+ oa->data = NULL;
+ return 0;
+}
+
+static int get_s32(void **p, void *max, s32 *res)
+{
+ void *base = *p;
+ void *next = (void *)((char *)base + sizeof(s32));
+ if (unlikely(next > max || next < base))
+ return -EINVAL;
+ memcpy(res, base, sizeof(s32));
+ *p = next;
+ return 0;
+}
+
+static int gssx_dec_linux_creds(struct xdr_stream *xdr,
+ struct svc_cred *creds)
+{
+ u32 length;
+ __be32 *p;
+ void *q, *end;
+ s32 tmp;
+ int N, i, err;
+
+ p = xdr_inline_decode(xdr, 4);
+ if (unlikely(p == NULL))
+ return -ENOSPC;
+
+ length = be32_to_cpup(p);
+
+ /* FIXME: we do not want to use the scratch buffer for this one
+ * may need to use functions that allows us to access an io vector
+ * directly */
+ p = xdr_inline_decode(xdr, length);
+ if (unlikely(p == NULL))
+ return -ENOSPC;
+
+ q = p;
+ end = q + length;
+
+ /* uid */
+ err = get_s32(&q, end, &tmp);
+ if (err)
+ return err;
+ creds->cr_uid = tmp;
+
+ /* gid */
+ err = get_s32(&q, end, &tmp);
+ if (err)
+ return err;
+ creds->cr_gid = tmp;
+
+ /* number of additional gid's */
+ err = get_s32(&q, end, &tmp);
+ if (err)
+ return err;
+ N = tmp;
+ creds->cr_group_info = groups_alloc(N);
+ if (creds->cr_group_info == NULL)
+ return -ENOMEM;
+
+ /* gid's */
+ for (i = 0; i < N; i++) {
+ err = get_s32(&q, end, &tmp);
+ if (err) {
+ groups_free(creds->cr_group_info);
+ return err;
+ }
+ GROUP_AT(creds->cr_group_info, i) = tmp;
+ }
+
+ return 0;
+}
+
+static int gssx_dec_option_array(struct xdr_stream *xdr,
+ struct gssx_option_array *oa)
+{
+ struct svc_cred *creds;
+ u32 count, i;
+ __be32 *p;
+ int err;
+
+ p = xdr_inline_decode(xdr, 4);
+ if (unlikely(p == NULL))
+ return -ENOSPC;
+ count = be32_to_cpup(p++);
+ if (count != 0) {
+ /* we recognize only 1 currently: CREDS_VALUE */
+ oa->count = 1;
+
+ oa->data = kmalloc(sizeof(struct gssx_option), GFP_KERNEL);
+ if (!oa->data)
+ return -ENOMEM;
+
+ creds = kmalloc(sizeof(struct svc_cred), GFP_KERNEL);
+ if (!creds) {
+ kfree(oa->data);
+ return -ENOMEM;
+ }
+
+ oa->data[0].option.data = CREDS_VALUE;
+ oa->data[0].option.len = sizeof(CREDS_VALUE);
+ oa->data[0].value.data = (void *)creds;
+ oa->data[0].value.len = 0;
+ }
+ for (i = 0; i < count; i++) {
+ gssx_buffer dummy = { 0, NULL };
+ u32 length;
+
+ /* option buffer */
+ p = xdr_inline_decode(xdr, 4);
+ if (unlikely(p == NULL))
+ return -ENOSPC;
+
+ length = be32_to_cpup(p);
+ p = xdr_inline_decode(xdr, length);
+ if (unlikely(p == NULL))
+ return -ENOSPC;
+
+ if (length == sizeof(CREDS_VALUE) &&
+ memcmp(p, CREDS_VALUE, sizeof(CREDS_VALUE)) == 0) {
+ /* We have creds here. parse them */
+ err = gssx_dec_linux_creds(xdr, creds);
+ if (err)
+ return err;
+ oa->data[0].value.len = 1; /* presence */
+ } else {
+ /* consume uninteresting buffer */
+ err = gssx_dec_buffer(xdr, &dummy);
+ if (err)
+ return err;
+ }
+ }
+ return 0;
+}
+
+static int gssx_dec_status(struct xdr_stream *xdr,
+ struct gssx_status *status)
+{
+ __be32 *p;
+ int err;
+
+ /* status->major_status */
+ p = xdr_inline_decode(xdr, 8);
+ if (unlikely(p == NULL))
+ return -ENOSPC;
+ p = xdr_decode_hyper(p, &status->major_status);
+
+ /* status->mech */
+ err = gssx_dec_buffer(xdr, &status->mech);
+ if (err)
+ return err;
+
+ /* status->minor_status */
+ p = xdr_inline_decode(xdr, 8);
+ if (unlikely(p == NULL))
+ return -ENOSPC;
+ p = xdr_decode_hyper(p, &status->minor_status);
+
+ /* status->major_status_string */
+ err = gssx_dec_buffer(xdr, &status->major_status_string);
+ if (err)
+ return err;
+
+ /* status->minor_status_string */
+ err = gssx_dec_buffer(xdr, &status->minor_status_string);
+ if (err)
+ return err;
+
+ /* status->server_ctx */
+ err = gssx_dec_buffer(xdr, &status->server_ctx);
+ if (err)
+ return err;
+
+ /* we assume we have no options for now, so simply consume them */
+ /* status->options */
+ err = dummy_dec_opt_array(xdr, &status->options);
+
+ return err;
+}
+
+static int gssx_enc_call_ctx(struct xdr_stream *xdr,
+ struct gssx_call_ctx *ctx)
+{
+ struct gssx_option opt;
+ __be32 *p;
+ int err;
+
+ /* ctx->locale */
+ err = gssx_enc_buffer(xdr, &ctx->locale);
+ if (err)
+ return err;
+
+ /* ctx->server_ctx */
+ err = gssx_enc_buffer(xdr, &ctx->server_ctx);
+ if (err)
+ return err;
+
+ /* we always want to ask for lucid contexts */
+ /* ctx->options */
+ p = xdr_reserve_space(xdr, 4);
+ *p = cpu_to_be32(2);
+
+ /* we want a lucid_v1 context */
+ opt.option.data = LUCID_OPTION;
+ opt.option.len = sizeof(LUCID_OPTION);
+ opt.value.data = LUCID_VALUE;
+ opt.value.len = sizeof(LUCID_VALUE);
+ err = gssx_enc_option(xdr, &opt);
+
+ /* ..and user creds */
+ opt.option.data = CREDS_OPTION;
+ opt.option.len = sizeof(CREDS_OPTION);
+ opt.value.data = CREDS_VALUE;
+ opt.value.len = sizeof(CREDS_VALUE);
+ err = gssx_enc_option(xdr, &opt);
+
+ return err;
+}
+
+static int gssx_dec_name_attr(struct xdr_stream *xdr,
+ struct gssx_name_attr *attr)
+{
+ int err;
+
+ /* attr->attr */
+ err = gssx_dec_buffer(xdr, &attr->attr);
+ if (err)
+ return err;
+
+ /* attr->value */
+ err = gssx_dec_buffer(xdr, &attr->value);
+ if (err)
+ return err;
+
+ /* attr->extensions */
+ err = dummy_dec_opt_array(xdr, &attr->extensions);
+
+ return err;
+}
+
+static int dummy_enc_nameattr_array(struct xdr_stream *xdr,
+ struct gssx_name_attr_array *naa)
+{
+ __be32 *p;
+
+ if (naa->count != 0)
+ return -EINVAL;
+
+ p = xdr_reserve_space(xdr, 4);
+ if (!p)
+ return -ENOSPC;
+ *p = 0;
+
+ return 0;
+}
+
+static int dummy_dec_nameattr_array(struct xdr_stream *xdr,
+ struct gssx_name_attr_array *naa)
+{
+ struct gssx_name_attr dummy;
+ u32 count, i;
+ __be32 *p;
+
+ p = xdr_inline_decode(xdr, 4);
+ if (unlikely(p == NULL))
+ return -ENOSPC;
+ count = be32_to_cpup(p++);
+ for (i = 0; i < count; i++) {
+ gssx_dec_name_attr(xdr, &dummy);
+ }
+
+ naa->count = 0;
+ naa->data = NULL;
+ return 0;
+}
+
+static int gssx_enc_name(struct xdr_stream *xdr,
+ struct gssx_name *name)
+{
+ int err;
+
+ /* name->display_name */
+ err = gssx_enc_buffer(xdr, &name->display_name);
+ if (err)
+ return err;
+
+ /* name->name_type */
+ err = gssx_enc_buffer(xdr, &name->name_type);
+ if (err)
+ return err;
+
+ /* name->exported_name */
+ err = gssx_enc_buffer(xdr, &name->exported_name);
+ if (err)
+ return err;
+
+ /* name->exported_composite_name */
+ err = gssx_enc_buffer(xdr, &name->exported_composite_name);
+ if (err)
+ return err;
+
+ /* leave name_attributes empty for now, will add once we have any
+ * to pass up at all */
+ /* name->name_attributes */
+ err = dummy_enc_nameattr_array(xdr, &name->name_attributes);
+ if (err)
+ return err;
+
+ /* leave options empty for now, will add once we have any options
+ * to pass up at all */
+ /* name->extensions */
+ err = dummy_enc_opt_array(xdr, &name->extensions);
+
+ return err;
+}
+
+static int gssx_dec_name(struct xdr_stream *xdr,
+ struct gssx_name *name)
+{
+ int err;
+
+ /* name->display_name */
+ err = gssx_dec_buffer(xdr, &name->display_name);
+ if (err)
+ return err;
+
+ /* name->name_type */
+ err = gssx_dec_buffer(xdr, &name->name_type);
+ if (err)
+ return err;
+
+ /* name->exported_name */
+ err = gssx_dec_buffer(xdr, &name->exported_name);
+ if (err)
+ return err;
+
+ /* name->exported_composite_name */
+ err = gssx_dec_buffer(xdr, &name->exported_composite_name);
+ if (err)
+ return err;
+
+ /* we assume we have no attributes for now, so simply consume them */
+ /* name->name_attributes */
+ err = dummy_dec_nameattr_array(xdr, &name->name_attributes);
+ if (err)
+ return err;
+
+ /* we assume we have no options for now, so simply consume them */
+ /* name->extensions */
+ err = dummy_dec_opt_array(xdr, &name->extensions);
+
+ return err;
+}
+
+static int gssx_dec_cred_element(struct xdr_stream *xdr,
+ struct gssx_cred_element *el)
+{
+ __be32 *p;
+ int err;
+
+ /* el->MN */
+ err = gssx_dec_name(xdr, &el->MN);
+ if (err)
+ return err;
+
+ /* el->mech */
+ err = gssx_dec_buffer(xdr, &el->mech);
+ if (err)
+ return err;
+
+ /* el->cred_usage */
+ p = xdr_inline_decode(xdr, 4+8+8);
+ if (!p)
+ return -ENOSPC;
+ el->cred_usage = be32_to_cpup(p++);
+
+ /* el->initiator_time_rec */
+ p = xdr_decode_hyper(p, &el->initiator_time_rec);
+
+ /* el->acceptor_time_rec */
+ p = xdr_decode_hyper(p, &el->initiator_time_rec);
+
+ /* we assume we have no options for now, so simply consume them */
+ /* el->options */
+ err = dummy_dec_opt_array(xdr, &el->options);
+
+ return err;
+}
+
+static int dummy_enc_credel_array(struct xdr_stream *xdr,
+ struct gssx_cred_element_array *cea)
+{
+ __be32 *p;
+
+ if (cea->count != 0)
+ return -EINVAL;
+
+ p = xdr_reserve_space(xdr, 4);
+ if (!p)
+ return -ENOSPC;
+ *p = 0;
+
+ return 0;
+}
+
+static int dummy_dec_credel_array(struct xdr_stream *xdr,
+ struct gssx_cred_element_array *cea)
+{
+ struct gssx_cred_element dummy;
+ u32 count, i;
+ __be32 *p;
+
+ p = xdr_inline_decode(xdr, 4);
+ if (unlikely(p == NULL))
+ return -ENOSPC;
+ count = be32_to_cpup(p++);
+ for (i = 0; i < count; i++) {
+ gssx_dec_cred_element(xdr, &dummy);
+ }
+
+ cea->count = 0;
+ cea->data = NULL;
+ return 0;
+}
+
+static int gssx_enc_cred(struct xdr_stream *xdr,
+ struct gssx_cred *cred)
+{
+ int err;
+
+ /* cred->desired_name */
+ err = gssx_enc_name(xdr, &cred->desired_name);
+ if (err)
+ return err;
+
+ /* cred->elements */
+ err = dummy_enc_credel_array(xdr, &cred->elements);
+
+ /* cred->cred_handle_reference */
+ err = gssx_enc_buffer(xdr, &cred->cred_handle_reference);
+ if (err)
+ return err;
+
+ /* cred->needs_release */
+ err = gssx_enc_bool(xdr, cred->needs_release);
+
+ return err;
+}
+
+static int gssx_dec_cred(struct xdr_stream *xdr,
+ struct gssx_cred *cred)
+{
+ int err;
+
+ /* cred->desired_name */
+ err = gssx_dec_name(xdr, &cred->desired_name);
+ if (err)
+ return err;
+
+ /* cred->elements */
+ err = dummy_dec_credel_array(xdr, &cred->elements);
+
+ /* cred->cred_handle_reference */
+ err = gssx_dec_buffer(xdr, &cred->cred_handle_reference);
+ if (err)
+ return err;
+
+ /* cred->needs_release */
+ err = gssx_dec_bool(xdr, &cred->needs_release);
+
+ return err;
+}
+
+static int gssx_enc_ctx(struct xdr_stream *xdr,
+ struct gssx_ctx *ctx)
+{
+ __be32 *p;
+ int err;
+
+ /* ctx->exported_context_token */
+ err = gssx_enc_buffer(xdr, &ctx->exported_context_token);
+ if (err)
+ return err;
+
+ /* ctx->state */
+ err = gssx_enc_buffer(xdr, &ctx->state);
+ if (err)
+ return err;
+
+ /* ctx->need_release */
+ err = gssx_enc_bool(xdr, ctx->need_release);
+ if (err)
+ return err;
+
+ /* ctx->mech */
+ err = gssx_enc_buffer(xdr, &ctx->mech);
+ if (err)
+ return err;
+
+ /* ctx->src_name */
+ err = gssx_enc_name(xdr, &ctx->src_name);
+ if (err)
+ return err;
+
+ /* ctx->targ_name */
+ err = gssx_enc_name(xdr, &ctx->targ_name);
+ if (err)
+ return err;
+
+ /* ctx->lifetime */
+ p = xdr_reserve_space(xdr, 8+8);
+ if (!p)
+ return -ENOSPC;
+ p = xdr_encode_hyper(p, ctx->lifetime);
+
+ /* ctx->ctx_flags */
+ p = xdr_encode_hyper(p, ctx->ctx_flags);
+
+ /* ctx->locally_initiated */
+ err = gssx_enc_bool(xdr, ctx->locally_initiated);
+ if (err)
+ return err;
+
+ /* ctx->open */
+ err = gssx_enc_bool(xdr, ctx->open);
+ if (err)
+ return err;
+
+ /* leave options empty for now, will add once we have any options
+ * to pass up at all */
+ /* ctx->options */
+ err = dummy_enc_opt_array(xdr, &ctx->options);
+
+ return err;
+}
+
+static int gssx_dec_ctx(struct xdr_stream *xdr,
+ struct gssx_ctx *ctx)
+{
+ __be32 *p;
+ int err;
+
+ /* ctx->exported_context_token */
+ err = gssx_dec_buffer(xdr, &ctx->exported_context_token);
+ if (err)
+ return err;
+
+ /* ctx->state */
+ err = gssx_dec_buffer(xdr, &ctx->state);
+ if (err)
+ return err;
+
+ /* ctx->need_release */
+ err = gssx_dec_bool(xdr, &ctx->need_release);
+ if (err)
+ return err;
+
+ /* ctx->mech */
+ err = gssx_dec_buffer(xdr, &ctx->mech);
+ if (err)
+ return err;
+
+ /* ctx->src_name */
+ err = gssx_dec_name(xdr, &ctx->src_name);
+ if (err)
+ return err;
+
+ /* ctx->targ_name */
+ err = gssx_dec_name(xdr, &ctx->targ_name);
+ if (err)
+ return err;
+
+ /* ctx->lifetime */
+ p = xdr_inline_decode(xdr, 8+8);
+ if (unlikely(p == NULL))
+ return -ENOSPC;
+ p = xdr_decode_hyper(p, &ctx->lifetime);
+
+ /* ctx->ctx_flags */
+ p = xdr_decode_hyper(p, &ctx->ctx_flags);
+
+ /* ctx->locally_initiated */
+ err = gssx_dec_bool(xdr, &ctx->locally_initiated);
+ if (err)
+ return err;
+
+ /* ctx->open */
+ err = gssx_dec_bool(xdr, &ctx->open);
+ if (err)
+ return err;
+
+ /* we assume we have no options for now, so simply consume them */
+ /* ctx->options */
+ err = dummy_dec_opt_array(xdr, &ctx->options);
+
+ return err;
+}
+
+static int gssx_enc_cb(struct xdr_stream *xdr, struct gssx_cb *cb)
+{
+ __be32 *p;
+ int err;
+
+ /* cb->initiator_addrtype */
+ p = xdr_reserve_space(xdr, 8);
+ if (!p)
+ return -ENOSPC;
+ p = xdr_encode_hyper(p, cb->initiator_addrtype);
+
+ /* cb->initiator_address */
+ err = gssx_enc_buffer(xdr, &cb->initiator_address);
+ if (err)
+ return err;
+
+ /* cb->acceptor_addrtype */
+ p = xdr_reserve_space(xdr, 8);
+ if (!p)
+ return -ENOSPC;
+ p = xdr_encode_hyper(p, cb->acceptor_addrtype);
+
+ /* cb->acceptor_address */
+ err = gssx_enc_buffer(xdr, &cb->acceptor_address);
+ if (err)
+ return err;
+
+ /* cb->application_data */
+ err = gssx_enc_buffer(xdr, &cb->application_data);
+
+ return err;
+}
+
+void gssx_enc_accept_sec_context(struct rpc_rqst *req,
+ struct xdr_stream *xdr,
+ struct gssx_arg_accept_sec_context *arg)
+{
+ int err;
+
+ err = gssx_enc_call_ctx(xdr, &arg->call_ctx);
+ if (err)
+ goto done;
+
+ /* arg->context_handle */
+ if (arg->context_handle) {
+ err = gssx_enc_ctx(xdr, arg->context_handle);
+ if (err)
+ goto done;
+ } else {
+ err = gssx_enc_bool(xdr, 0);
+ }
+
+ /* arg->cred_handle */
+ if (arg->cred_handle) {
+ err = gssx_enc_cred(xdr, arg->cred_handle);
+ if (err)
+ goto done;
+ } else {
+ err = gssx_enc_bool(xdr, 0);
+ }
+
+ /* arg->input_token */
+ err = gssx_enc_in_token(xdr, &arg->input_token);
+ if (err)
+ goto done;
+
+ /* arg->input_cb */
+ if (arg->input_cb) {
+ err = gssx_enc_cb(xdr, arg->input_cb);
+ if (err)
+ goto done;
+ } else {
+ err = gssx_enc_bool(xdr, 0);
+ }
+
+ err = gssx_enc_bool(xdr, arg->ret_deleg_cred);
+ if (err)
+ goto done;
+
+ /* leave options empty for now, will add once we have any options
+ * to pass up at all */
+ /* arg->options */
+ err = dummy_enc_opt_array(xdr, &arg->options);
+
+done:
+ if (err)
+ dprintk("RPC: gssx_enc_accept_sec_context: %d\n", err);
+}
+
+int gssx_dec_accept_sec_context(struct rpc_rqst *rqstp,
+ struct xdr_stream *xdr,
+ struct gssx_res_accept_sec_context *res)
+{
+ int err;
+
+ /* res->status */
+ err = gssx_dec_status(xdr, &res->status);
+ if (err)
+ return err;
+
+ /* res->context_handle */
+ if (gssx_check_pointer(xdr)) {
+ err = gssx_dec_ctx(xdr, res->context_handle);
+ if (err)
+ return err;
+ } else {
+ res->context_handle = NULL;
+ }
+
+ /* res->output_token */
+ if (gssx_check_pointer(xdr)) {
+ err = gssx_dec_buffer(xdr, res->output_token);
+ if (err)
+ return err;
+ } else {
+ res->output_token = NULL;
+ }
+
+ /* res->delegated_cred_handle */
+ if (gssx_check_pointer(xdr)) {
+ err = gssx_dec_cred(xdr, res->delegated_cred_handle);
+ if (err)
+ return err;
+ } else {
+ res->delegated_cred_handle = NULL;
+ }
+
+ /* we assume we have no options for now, so simply consume them */
+ /* res->options */
+ err = gssx_dec_option_array(xdr, &res->options);
+
+ return err;
+}
diff --git a/net/sunrpc/auth_gss/gss_rpc_xdr.h b/net/sunrpc/auth_gss/gss_rpc_xdr.h
new file mode 100644
index 0000000..9256a58
--- /dev/null
+++ b/net/sunrpc/auth_gss/gss_rpc_xdr.h
@@ -0,0 +1,269 @@
+/*
+ * GSS Proxy upcall module
+ *
+ * Copyright (C) 2012 Simo Sorce <simo@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef _LINUX_GSS_RPC_XDR_H
+#define _LINUX_GSS_RPC_XDR_H
+
+#include <linux/sunrpc/xdr.h>
+#include <linux/sunrpc/clnt.h>
+#include <linux/sunrpc/xprtsock.h>
+
+#ifdef RPC_DEBUG
+# define RPCDBG_FACILITY RPCDBG_AUTH
+#endif
+
+#define LUCID_OPTION "exported_context_type"
+#define LUCID_VALUE "linux_lucid_v1"
+#define CREDS_OPTION "exported_creds_type"
+#define CREDS_VALUE "linux_creds_v1"
+
+typedef struct xdr_netobj gssx_buffer;
+typedef struct xdr_netobj utf8string;
+typedef struct xdr_netobj gssx_OID;
+
+enum gssx_cred_usage {
+ GSSX_C_INITIATE = 1,
+ GSSX_C_ACCEPT = 2,
+ GSSX_C_BOTH = 3,
+};
+
+struct gssx_option {
+ gssx_buffer option;
+ gssx_buffer value;
+};
+
+struct gssx_option_array {
+ u32 count;
+ struct gssx_option *data;
+};
+
+struct gssx_status {
+ u64 major_status;
+ gssx_OID mech;
+ u64 minor_status;
+ utf8string major_status_string;
+ utf8string minor_status_string;
+ gssx_buffer server_ctx;
+ struct gssx_option_array options;
+};
+
+struct gssx_call_ctx {
+ utf8string locale;
+ gssx_buffer server_ctx;
+ struct gssx_option_array options;
+};
+
+struct gssx_name_attr {
+ gssx_buffer attr;
+ gssx_buffer value;
+ struct gssx_option_array extensions;
+};
+
+struct gssx_name_attr_array {
+ u32 count;
+ struct gssx_name_attr *data;
+};
+
+struct gssx_name {
+ gssx_buffer display_name;
+ gssx_OID name_type;
+ gssx_buffer exported_name;
+ gssx_buffer exported_composite_name;
+ struct gssx_name_attr_array name_attributes;
+ struct gssx_option_array extensions;
+};
+typedef struct gssx_name gssx_name;
+
+struct gssx_cred_element {
+ gssx_name MN;
+ gssx_OID mech;
+ u32 cred_usage;
+ u64 initiator_time_rec;
+ u64 acceptor_time_rec;
+ struct gssx_option_array options;
+};
+
+struct gssx_cred_element_array {
+ u32 count;
+ struct gssx_cred_element *data;
+};
+
+struct gssx_cred {
+ gssx_name desired_name;
+ struct gssx_cred_element_array elements;
+ gssx_buffer cred_handle_reference;
+ u32 needs_release;
+};
+
+struct gssx_ctx {
+ gssx_buffer exported_context_token;
+ gssx_buffer state;
+ u32 need_release;
+ gssx_OID mech;
+ gssx_name src_name;
+ gssx_name targ_name;
+ u64 lifetime;
+ u64 ctx_flags;
+ u32 locally_initiated;
+ u32 open;
+ struct gssx_option_array options;
+};
+
+struct gssx_cb {
+ u64 initiator_addrtype;
+ gssx_buffer initiator_address;
+ u64 acceptor_addrtype;
+ gssx_buffer acceptor_address;
+ gssx_buffer application_data;
+};
+
+
+/* This structure is not defined in the protocol.
+ * It is used in the kernel to carry around a big buffer
+ * as a set of pages */
+struct gssp_in_token {
+ struct page **pages; /* Array of contiguous pages */
+ unsigned int page_base; /* Start of page data */
+ unsigned int page_len; /* Length of page data */
+};
+
+struct gssx_arg_accept_sec_context {
+ struct gssx_call_ctx call_ctx;
+ struct gssx_ctx *context_handle;
+ struct gssx_cred *cred_handle;
+ struct gssp_in_token input_token;
+ struct gssx_cb *input_cb;
+ u32 ret_deleg_cred;
+ struct gssx_option_array options;
+};
+
+struct gssx_res_accept_sec_context {
+ struct gssx_status status;
+ struct gssx_ctx *context_handle;
+ gssx_buffer *output_token;
+ struct gssx_cred *delegated_cred_handle;
+ struct gssx_option_array options;
+};
+
+
+
+#define gssx_enc_indicate_mechs NULL
+#define gssx_dec_indicate_mechs NULL
+#define gssx_enc_get_call_context NULL
+#define gssx_dec_get_call_context NULL
+#define gssx_enc_import_and_canon_name NULL
+#define gssx_dec_import_and_canon_name NULL
+#define gssx_enc_export_cred NULL
+#define gssx_dec_export_cred NULL
+#define gssx_enc_import_cred NULL
+#define gssx_dec_import_cred NULL
+#define gssx_enc_acquire_cred NULL
+#define gssx_dec_acquire_cred NULL
+#define gssx_enc_store_cred NULL
+#define gssx_dec_store_cred NULL
+#define gssx_enc_init_sec_context NULL
+#define gssx_dec_init_sec_context NULL
+void gssx_enc_accept_sec_context(struct rpc_rqst *req,
+ struct xdr_stream *xdr,
+ struct gssx_arg_accept_sec_context *args);
+int gssx_dec_accept_sec_context(struct rpc_rqst *rqstp,
+ struct xdr_stream *xdr,
+ struct gssx_res_accept_sec_context *res);
+#define gssx_enc_release_handle NULL
+#define gssx_dec_release_handle NULL
+#define gssx_enc_get_mic NULL
+#define gssx_dec_get_mic NULL
+#define gssx_enc_verify NULL
+#define gssx_dec_verify NULL
+#define gssx_enc_wrap NULL
+#define gssx_dec_wrap NULL
+#define gssx_enc_unwrap NULL
+#define gssx_dec_unwrap NULL
+#define gssx_enc_wrap_size_limit NULL
+#define gssx_dec_wrap_size_limit NULL
+
+/* non implemented calls are set to 0 size */
+#define GSSX_ARG_indicate_mechs_sz 0
+#define GSSX_RES_indicate_mechs_sz 0
+#define GSSX_ARG_get_call_context_sz 0
+#define GSSX_RES_get_call_context_sz 0
+#define GSSX_ARG_import_and_canon_name_sz 0
+#define GSSX_RES_import_and_canon_name_sz 0
+#define GSSX_ARG_export_cred_sz 0
+#define GSSX_RES_export_cred_sz 0
+#define GSSX_ARG_import_cred_sz 0
+#define GSSX_RES_import_cred_sz 0
+#define GSSX_ARG_acquire_cred_sz 0
+#define GSSX_RES_acquire_cred_sz 0
+#define GSSX_ARG_store_cred_sz 0
+#define GSSX_RES_store_cred_sz 0
+#define GSSX_ARG_init_sec_context_sz 0
+#define GSSX_RES_init_sec_context_sz 0
+
+#define GSSX_default_in_call_ctx_sz (4 + 4 + 4 + \
+ 8 + sizeof(LUCID_OPTION) + sizeof(LUCID_VALUE) + \
+ 8 + sizeof(CREDS_OPTION) + sizeof(CREDS_VALUE))
+#define GSSX_default_in_ctx_hndl_sz (4 + 4+8 + 4 + 4 + 6*4 + 6*4 + 8 + 8 + \
+ 4 + 4 + 4)
+#define GSSX_default_in_cred_sz 4 /* we send in no cred_handle */
+#define GSSX_default_in_token_sz 4 /* does *not* include token data */
+#define GSSX_default_in_cb_sz 4 /* we do not use channel bindings */
+#define GSSX_ARG_accept_sec_context_sz (GSSX_default_in_call_ctx_sz + \
+ GSSX_default_in_ctx_hndl_sz + \
+ GSSX_default_in_cred_sz + \
+ GSSX_default_in_token_sz + \
+ GSSX_default_in_cb_sz + \
+ 4 /* no deleg creds boolean */ + \
+ 4) /* empty options */
+
+/* somewhat arbitrary numbers but large enough (we ignore some of the data
+ * sent down, but it is part of the protocol so we need enough space to take
+ * it in) */
+#define GSSX_default_status_sz 8 + 24 + 8 + 256 + 256 + 16 + 4
+#define GSSX_max_output_handle_sz 128
+#define GSSX_max_oid_sz 16
+#define GSSX_max_princ_sz 256
+#define GSSX_default_ctx_sz (GSSX_max_output_handle_sz + \
+ 16 + 4 + GSSX_max_oid_sz + \
+ 2 * GSSX_max_princ_sz + \
+ 8 + 8 + 4 + 4 + 4)
+#define GSSX_max_output_token_sz 1024
+#define GSSX_max_creds_sz (4 + 4 + 4 + NGROUPS_MAX * 4)
+#define GSSX_RES_accept_sec_context_sz (GSSX_default_status_sz + \
+ GSSX_default_ctx_sz + \
+ GSSX_max_output_token_sz + \
+ 4 + GSSX_max_creds_sz)
+
+#define GSSX_ARG_release_handle_sz 0
+#define GSSX_RES_release_handle_sz 0
+#define GSSX_ARG_get_mic_sz 0
+#define GSSX_RES_get_mic_sz 0
+#define GSSX_ARG_verify_sz 0
+#define GSSX_RES_verify_sz 0
+#define GSSX_ARG_wrap_sz 0
+#define GSSX_RES_wrap_sz 0
+#define GSSX_ARG_unwrap_sz 0
+#define GSSX_RES_unwrap_sz 0
+#define GSSX_ARG_wrap_size_limit_sz 0
+#define GSSX_RES_wrap_size_limit_sz 0
+
+
+
+#endif /* _LINUX_GSS_RPC_XDR_H */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 6/6] SUNRPC: Use gssproxy upcall for server RPCGSS authentication.
2013-02-21 16:38 [PATCH 0/6] gss-proxy upcall for nfsd J. Bruce Fields
` (4 preceding siblings ...)
2013-02-21 16:38 ` [PATCH 5/6] SUNRPC: Add RPC based upcall mechanism for RPCGSS auth J. Bruce Fields
@ 2013-02-21 16:38 ` J. Bruce Fields
2013-02-21 21:01 ` J. Bruce Fields
5 siblings, 1 reply; 21+ messages in thread
From: J. Bruce Fields @ 2013-02-21 16:38 UTC (permalink / raw)
To: linux-nfs; +Cc: Trond.Myklebust, chuck.lever, simo, J. Bruce Fields
From: Simo Sorce <simo@redhat.com>
The main advantge of this new upcall mechanism is that it can handle
big tickets as seen in Kerberos implementations where tickets carry
authorization data like the MS-PAC buffer with AD or the Posix Authorization
Data being discussed in IETF on the krbwg working group.
The Gssproxy program is used to perform the accept_sec_context call on the
kernel's behalf. The code is changed to also pass the input buffer straight
to upcall mechanism to avoid allocating and copying many pages as tokens can
be as big (potentially more in future) as 64KiB.
Signed-off-by: Simo Sorce <simo@redhat.com>
[bfields: containerization, concurrent upcalls, negotiation api]
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
---
Documentation/filesystems/nfs/00-INDEX | 2 +
Documentation/filesystems/nfs/rpc-server-gss.txt | 91 ++++++
net/sunrpc/auth_gss/gss_rpc_upcall.c | 75 ++---
net/sunrpc/auth_gss/gss_rpc_upcall.h | 4 +
net/sunrpc/auth_gss/svcauth_gss.c | 347 +++++++++++++++++++++-
net/sunrpc/clnt.c | 1 +
net/sunrpc/netns.h | 6 +
7 files changed, 483 insertions(+), 43 deletions(-)
create mode 100644 Documentation/filesystems/nfs/rpc-server-gss.txt
diff --git a/Documentation/filesystems/nfs/00-INDEX b/Documentation/filesystems/nfs/00-INDEX
index 1716874..66eb6c8 100644
--- a/Documentation/filesystems/nfs/00-INDEX
+++ b/Documentation/filesystems/nfs/00-INDEX
@@ -20,3 +20,5 @@ rpc-cache.txt
- introduction to the caching mechanisms in the sunrpc layer.
idmapper.txt
- information for configuring request-keys to be used by idmapper
+knfsd-rpcgss.txt
+ - Information on GSS authentication support in the NFS Server
diff --git a/Documentation/filesystems/nfs/rpc-server-gss.txt b/Documentation/filesystems/nfs/rpc-server-gss.txt
new file mode 100644
index 0000000..716f4be
--- /dev/null
+++ b/Documentation/filesystems/nfs/rpc-server-gss.txt
@@ -0,0 +1,91 @@
+
+rpcsec_gss support for kernel RPC servers
+=========================================
+
+This document gives references to the standards and protocols used to
+implement RPCGSS authentication in kernel RPC servers such as the NFS
+server and the NFS client's NFSv4.0 callback server. (But note that
+NFSv4.1 and higher don't require the client to act as a server for the
+purposes of authentication.)
+
+RPCGSS is specified in a few IETF documents:
+ - RFC2203 v1: http://tools.ietf.org/rfc/rfc2203.txt
+ - RFC5403 v2: http://tools.ietf.org/rfc/rfc5403.txt
+and there is a 3rd version being proposed:
+ - http://tools.ietf.org/id/draft-williams-rpcsecgssv3.txt
+ (At draft n. 02 at the time of writing)
+
+Background
+----------
+
+The RPCGSS Authentication method describes a way to perform GSSAPI
+Authentication for NFS. Although GSSAPI is itself completely mechanism
+agnostic, in many cases only the KRB5 mechanism is supported by NFS
+implementations.
+
+The Linux kernel, at the moment, supports only the KRB5 mechanism, and
+depends on GSSAPI extensions that are KRB5 specific.
+
+GSSAPI is a complex library, and implementing it completely in kernel is
+unwarranted. However GSSAPI operations are fundementally separable in 2
+parts:
+- initial context establishment
+- integrity/privacy protection (signing and encrypting of individual
+ packets)
+
+The former is more complex and policy-independent, but less
+performance-sensitive. The latter is simpler and needs to be very fast.
+
+Therefore, we perform per-packet integrity and privacy protection in the
+kernel, but leave the initial context establishment to userspace. We
+need upcalls to request userspace to perform context establishment.
+
+NFS Server Legacy Upcall Mechanism
+----------------------------------
+
+The classic upcall mechanism uses a custom text based upcall mechanism
+to talk to a custom daemon called rpc.svcgssd that is provide by the
+nfs-utils package.
+
+This upcall mechanism has 2 limitations:
+
+A) It can handle tokens that are no bigger than 2KiB
+
+In some Kerberos deployment GSSAPI tokens can be quite big, up and
+beyond 64KiB in size due to various authorization extensions attacked to
+the Kerberos tickets, that needs to be sent through the GSS layer in
+order to perform context establishment.
+
+B) It does not properly handle creds where the user is member of more
+than a few housand groups (the current hard limit in the kernel is 65K
+groups) due to limitation on the size of the buffer that can be send
+back to the kernel (4KiB).
+
+NFS Server New RPC Upcall Mechanism
+-----------------------------------
+
+The newer upcall mechanism uses RPC over a unix socket to a daemon
+called gss-proxy, implemented by a userspace program called Gssproxy.
+
+The gss_proxy RPC protocol is currently documented here:
+
+ https://fedorahosted.org/gss-proxy/wiki/ProtocolDocumentation
+
+This upcall mechanism uses the kernel rpc client and connects to the gssproxy
+userspace program over a regular unix socket. The gssproxy protocol does not
+suffer from the size limitations of the legacy protocol.
+
+Negotiating Upcall Mechanisms
+-----------------------------
+
+To provide backward compatibility, the kernel defaults to using the
+legacy mechanism. To switch to the new mechanism, gss-proxy must bind
+to /var/run/gssproxy.sock and then write "1" to
+/proc/net/rpc/use-gss-proxy. If gss-proxy dies, it must repeat both
+steps.
+
+Once the upcall mechanism is chosen, it cannot be changed. To prevent
+locking into the legacy mechanisms, the above steps must be performed
+before starting nfsd. Whoever starts nfsd can guarantee this by reading
+from /proc/net/rpc/use-gss-proxy and checking that it contains a
+"1"--the read will block until gss-proxy has done its write to the file.
diff --git a/net/sunrpc/auth_gss/gss_rpc_upcall.c b/net/sunrpc/auth_gss/gss_rpc_upcall.c
index 5fd8c91..229f941 100644
--- a/net/sunrpc/auth_gss/gss_rpc_upcall.c
+++ b/net/sunrpc/auth_gss/gss_rpc_upcall.c
@@ -29,9 +29,6 @@
#define GSSPROXY_PROGRAM (400112u)
#define GSSPROXY_VERS_1 (1u)
-DEFINE_MUTEX(gssp_clnt_mutex);
-struct rpc_clnt *gssp_clnt;
-
/*
* Encoding/Decoding functions
*/
@@ -129,49 +126,62 @@ out:
return result;
}
-static struct rpc_clnt *get_clnt(struct net *net, bool global_clnt)
+void init_gssp_clnt(struct sunrpc_net *sn)
{
- struct rpc_clnt *clnt;
- int err;
-
- mutex_lock(&gssp_clnt_mutex);
+ mutex_init(&sn->gssp_lock);
+ sn->gssp_clnt = NULL;
+ init_waitqueue_head(&sn->gssp_wq);
+}
- if (global_clnt && gssp_clnt)
- return gssp_clnt;
+int set_gssp_clnt(struct net *net)
+{
+ struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
+ struct rpc_clnt *clnt;
+ int ret;
- err = gssp_rpc_create(net, &clnt);
- if (err) {
- mutex_unlock(&gssp_clnt_mutex);
- return NULL;
+ mutex_lock(&sn->gssp_lock);
+ ret = gssp_rpc_create(net, &clnt);
+ if (!ret) {
+ if (sn->gssp_clnt)
+ rpc_shutdown_client(sn->gssp_clnt);
+ sn->gssp_clnt = clnt;
}
- if (global_clnt)
- gssp_clnt = clnt;
-
- mutex_unlock(&gssp_clnt_mutex);
- return clnt;
+ mutex_unlock(&sn->gssp_lock);
+ wake_up(&sn->gssp_wq);
+ return ret;
}
-static void kill_clnt(struct rpc_clnt *clnt)
+void clear_gssp_clnt(struct sunrpc_net *sn)
{
- BUG_ON(clnt == NULL);
-
- mutex_lock(&gssp_clnt_mutex);
+ mutex_lock(&sn->gssp_lock);
+ if (sn->gssp_clnt) {
+ rpc_shutdown_client(sn->gssp_clnt);
+ sn->gssp_clnt = NULL;
+ }
+ mutex_unlock(&sn->gssp_lock);
+}
- rpc_shutdown_client(clnt);
- if (clnt == gssp_clnt)
- gssp_clnt = NULL;
+static struct rpc_clnt *get_gssp_clnt(struct sunrpc_net *sn)
+{
+ struct rpc_clnt *clnt;
- mutex_unlock(&gssp_clnt_mutex);
+ mutex_lock(&sn->gssp_lock);
+ clnt = sn->gssp_clnt;
+ if (clnt)
+ atomic_inc(&clnt->cl_count);
+ mutex_unlock(&sn->gssp_lock);
+ return clnt;
}
static int gssp_call(struct net *net, struct rpc_message *msg)
{
+ struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
struct rpc_clnt *clnt;
int status;
- /* for now always create new one */
- clnt = get_clnt(net, false);
-
+ clnt = get_gssp_clnt(sn);
+ if (!clnt)
+ return -EIO;
status = rpc_call_sync(clnt, msg, 0);
if (status < 0) {
dprintk("gssp: rpc_call returned error %d\n", -status);
@@ -192,10 +202,7 @@ static int gssp_call(struct net *net, struct rpc_message *msg)
break;
}
}
-
- /* always kill connection for now */
- kill_clnt(clnt);
-
+ rpc_release_client(clnt);
return status;
}
diff --git a/net/sunrpc/auth_gss/gss_rpc_upcall.h b/net/sunrpc/auth_gss/gss_rpc_upcall.h
index 83aca5a..4c2caaa 100644
--- a/net/sunrpc/auth_gss/gss_rpc_upcall.h
+++ b/net/sunrpc/auth_gss/gss_rpc_upcall.h
@@ -23,6 +23,7 @@
#include <linux/sunrpc/auth_gss.h>
#include "gss_rpc_xdr.h"
+#include "../netns.h"
struct gssp_upcall_data {
struct xdr_netobj in_handle;
@@ -40,4 +41,7 @@ int gssp_accept_sec_context_upcall(struct net *net,
struct gssp_upcall_data *data);
void gssp_free_upcall_data(struct gssp_upcall_data *data);
+void init_gssp_clnt(struct sunrpc_net *);
+int set_gssp_clnt(struct net *);
+void clear_gssp_clnt(struct sunrpc_net *);
#endif /* _GSS_RPC_UPCALL_H */
diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
index 8fff637..94e6fff 100644
--- a/net/sunrpc/auth_gss/svcauth_gss.c
+++ b/net/sunrpc/auth_gss/svcauth_gss.c
@@ -48,8 +48,8 @@
#include <linux/sunrpc/svcauth.h>
#include <linux/sunrpc/svcauth_gss.h>
#include <linux/sunrpc/cache.h>
+#include "gss_rpc_upcall.h"
-#include "../netns.h"
#ifdef RPC_DEBUG
# define RPCDBG_FACILITY RPCDBG_AUTH
@@ -976,13 +976,10 @@ gss_write_init_verf(struct cache_detail *cd, struct svc_rqst *rqstp,
}
static inline int
-gss_read_verf(struct rpc_gss_wire_cred *gc,
- struct kvec *argv, __be32 *authp,
- struct xdr_netobj *in_handle,
- struct xdr_netobj *in_token)
+gss_read_common_verf(struct rpc_gss_wire_cred *gc,
+ struct kvec *argv, __be32 *authp,
+ struct xdr_netobj *in_handle)
{
- struct xdr_netobj tmpobj;
-
/* Read the verifier; should be NULL: */
*authp = rpc_autherr_badverf;
if (argv->iov_len < 2 * 4)
@@ -998,6 +995,23 @@ gss_read_verf(struct rpc_gss_wire_cred *gc,
if (dup_netobj(in_handle, &gc->gc_ctx))
return SVC_CLOSE;
*authp = rpc_autherr_badverf;
+
+ return 0;
+}
+
+static inline int
+gss_read_verf(struct rpc_gss_wire_cred *gc,
+ struct kvec *argv, __be32 *authp,
+ struct xdr_netobj *in_handle,
+ struct xdr_netobj *in_token)
+{
+ struct xdr_netobj tmpobj;
+ int res;
+
+ res = gss_read_common_verf(gc, argv, authp, in_handle);
+ if (res)
+ return res;
+
if (svc_safe_getnetobj(argv, &tmpobj)) {
kfree(in_handle->data);
return SVC_DENIED;
@@ -1010,6 +1024,40 @@ gss_read_verf(struct rpc_gss_wire_cred *gc,
return 0;
}
+/* Ok this is really heavily depending on a set of semantics in
+ * how rqstp is set up by svc_recv and pages laid down by the
+ * server when reading a request. We are basically guaranteed that
+ * the token lays all down linearly across a set of pages, starting
+ * at iov_base in rq_arg.head[0] which happens to be the first of a
+ * set of pages stored in rq_pages[].
+ * rq_arg.head[0].iov_base will provide us the page_base to pass
+ * to the upcall.
+ */
+static inline int
+gss_read_proxy_verf(struct svc_rqst *rqstp,
+ struct rpc_gss_wire_cred *gc, __be32 *authp,
+ struct xdr_netobj *in_handle,
+ struct gssp_in_token *in_token)
+{
+ struct kvec *argv = &rqstp->rq_arg.head[0];
+ u32 inlen;
+ int res;
+
+ res = gss_read_common_verf(gc, argv, authp, in_handle);
+ if (res)
+ return res;
+
+ inlen = svc_getnl(argv);
+ if (inlen > (argv->iov_len + rqstp->rq_arg.page_len))
+ return SVC_DENIED;
+
+ in_token->pages = rqstp->rq_pages;
+ in_token->page_base = (ulong)argv->iov_base & ~PAGE_MASK;
+ in_token->page_len = inlen;
+
+ return 0;
+}
+
static inline int
gss_write_resv(struct kvec *resv, size_t size_limit,
struct xdr_netobj *out_handle, struct xdr_netobj *out_token,
@@ -1037,7 +1085,7 @@ gss_write_resv(struct kvec *resv, size_t size_limit,
* 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,
+static int svcauth_gss_legacy_init(struct svc_rqst *rqstp,
struct rpc_gss_wire_cred *gc, __be32 *authp)
{
struct kvec *argv = &rqstp->rq_arg.head[0];
@@ -1077,6 +1125,278 @@ out:
return ret;
}
+static int gss_proxy_save_rsc(struct cache_detail *cd,
+ struct gssp_upcall_data *ud,
+ uint64_t *handle)
+{
+ struct rsc rsci, *rscp = NULL;
+ static atomic64_t ctxhctr;
+ long long ctxh;
+ struct gss_api_mech *gm = NULL;
+ time_t expiry;
+ int status = -EINVAL;
+
+ memset(&rsci, 0, sizeof(rsci));
+ /* context handle */
+ status = -ENOMEM;
+ /* the handle needs to be just a unique id,
+ * use a static counter */
+ ctxh = atomic64_inc_return(&ctxhctr);
+
+ /* make a copy for the caller */
+ *handle = ctxh;
+
+ /* make a copy for the rsc cache */
+ if (dup_to_netobj(&rsci.handle, (char *)handle, sizeof(uint64_t)))
+ goto out;
+ rscp = rsc_lookup(cd, &rsci);
+ if (!rscp)
+ goto out;
+
+ /* creds */
+ if (!ud->found_creds) {
+ /* userspace seem buggy, we should always get at least a
+ * mapping to nobody */
+ dprintk("RPC: No creds found, marking Negative!\n");
+ set_bit(CACHE_NEGATIVE, &rsci.h.flags);
+ } else {
+
+ /* steal creds */
+ rsci.cred = ud->creds;
+ memset(&ud->creds, 0, sizeof(struct svc_cred));
+
+ status = -EOPNOTSUPP;
+ /* get mech handle from OID */
+ gm = gss_mech_get_by_OID(&ud->mech_oid);
+ if (!gm)
+ goto out;
+
+ status = -EINVAL;
+ /* mech-specific data: */
+ status = gss_import_sec_context(ud->out_handle.data,
+ ud->out_handle.len,
+ gm, &rsci.mechctx,
+ &expiry, GFP_KERNEL);
+ if (status)
+ goto out;
+ }
+
+ rsci.h.expiry_time = expiry;
+ rscp = rsc_update(cd, &rsci, rscp);
+ status = 0;
+out:
+ gss_mech_put(gm);
+ rsc_free(&rsci);
+ if (rscp)
+ cache_put(&rscp->h, cd);
+ else
+ status = -ENOMEM;
+ return status;
+}
+
+static int svcauth_gss_proxy_init(struct svc_rqst *rqstp,
+ struct rpc_gss_wire_cred *gc, __be32 *authp)
+{
+ struct kvec *resv = &rqstp->rq_res.head[0];
+ struct xdr_netobj cli_handle;
+ struct gssp_upcall_data ud;
+ uint64_t handle;
+ int status;
+ int ret;
+ struct net *net = rqstp->rq_xprt->xpt_net;
+ struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
+
+ memset(&ud, 0, sizeof(ud));
+ ret = gss_read_proxy_verf(rqstp, gc, authp,
+ &ud.in_handle, &ud.in_token);
+ if (ret)
+ return ret;
+
+ ret = SVC_CLOSE;
+
+ /* Perform synchronous upcall to gss-proxy */
+ status = gssp_accept_sec_context_upcall(net, &ud);
+ if (status)
+ goto out;
+
+ dprintk("RPC: svcauth_gss: gss major status = %d\n",
+ ud.major_status);
+
+ switch (ud.major_status) {
+ case GSS_S_CONTINUE_NEEDED:
+ cli_handle = ud.out_handle;
+ break;
+ case GSS_S_COMPLETE:
+ status = gss_proxy_save_rsc(sn->rsc_cache, &ud, &handle);
+ if (status)
+ goto out;
+ cli_handle.data = (u8 *)&handle;
+ cli_handle.len = sizeof(handle);
+ break;
+ default:
+ ret = SVC_CLOSE;
+ goto out;
+ }
+
+ /* Got an answer to the upcall; use it: */
+ if (gss_write_init_verf(sn->rsc_cache, rqstp,
+ &cli_handle, &ud.major_status))
+ goto out;
+ if (gss_write_resv(resv, PAGE_SIZE,
+ &cli_handle, &ud.out_token,
+ ud.major_status, ud.minor_status))
+ goto out;
+
+ ret = SVC_COMPLETE;
+out:
+ gssp_free_upcall_data(&ud);
+ return ret;
+}
+
+DEFINE_SPINLOCK(use_gssp_lock);
+
+static bool use_gss_proxy(struct net *net)
+{
+ struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
+
+ if (sn->use_gss_proxy != -1)
+ return sn->use_gss_proxy;
+ spin_lock(&use_gssp_lock);
+ /*
+ * If you wanted gss-proxy, you should have said so before
+ * starting to accept requests:
+ */
+ sn->use_gss_proxy = 0;
+ spin_unlock(&use_gssp_lock);
+ return 0;
+}
+
+static bool set_gss_proxy(struct net *net, int type)
+{
+ struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
+ int ret = 0;
+
+ WARN_ON_ONCE(type != 0 && type != 1);
+ spin_lock(&use_gssp_lock);
+ if (sn->use_gss_proxy == -1 || sn->use_gss_proxy == type)
+ sn->use_gss_proxy = type;
+ else
+ ret = -EBUSY;
+ spin_unlock(&use_gssp_lock);
+ wake_up(&sn->gssp_wq);
+ return ret;
+}
+
+static inline bool gssp_ready(struct sunrpc_net *sn)
+{
+ switch (sn->use_gss_proxy) {
+ case -1:
+ return false;
+ case 0:
+ return true;
+ case 1:
+ return sn->gssp_clnt;
+ }
+ WARN_ON_ONCE(1);
+ return false;
+}
+
+static int wait_for_gss_proxy(struct net *net)
+{
+ struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
+
+ return wait_event_interruptible(sn->gssp_wq, gssp_ready(sn));
+}
+
+#ifdef CONFIG_PROC_FS
+
+static ssize_t write_gssp(struct file *file, const char __user *buf,
+ size_t count, loff_t *ppos)
+{
+ struct net *net = PDE(file->f_path.dentry->d_inode)->data;
+ char tbuf[20];
+ unsigned long i;
+ int res;
+
+ if (*ppos || count > sizeof(tbuf)-1)
+ return -EINVAL;
+ if (copy_from_user(tbuf, buf, count))
+ return -EFAULT;
+
+ tbuf[count] = 0;
+ res = kstrtoul(tbuf, 0, &i);
+ if (res)
+ return res;
+ if (i != 1)
+ return -EINVAL;
+ res = set_gss_proxy(net, 1);
+ if (res)
+ return res;
+ res = set_gssp_clnt(net);
+ if (res)
+ return res;
+ return count;
+}
+
+static ssize_t read_gssp(struct file *file, char __user *buf,
+ size_t count, loff_t *ppos)
+{
+ struct net *net = PDE(file->f_path.dentry->d_inode)->data;
+ unsigned long p = *ppos;
+ char tbuf[10];
+ size_t len;
+ int ret;
+
+ ret = wait_for_gss_proxy(net);
+ if (ret)
+ return ret;
+
+ snprintf(tbuf, sizeof(tbuf), "%d\n", use_gss_proxy(net));
+ len = strlen(tbuf);
+ if (p >= len)
+ return 0;
+ len -= p;
+ if (len > count)
+ len = count;
+ if (copy_to_user(buf, (void *)(tbuf+p), len))
+ return -EFAULT;
+ *ppos += len;
+ return len;
+}
+
+static const struct file_operations use_gss_proxy_ops = {
+ .open = nonseekable_open,
+ .write = write_gssp,
+ .read = read_gssp,
+};
+
+static int create_use_gss_proxy_proc_entry(struct net *net)
+{
+ struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
+ struct proc_dir_entry **p = &sn->use_gssp_proc;
+
+ sn->use_gss_proxy = -1;
+ *p = proc_create_data("use-gss-proxy", S_IFREG|S_IRUSR|S_IWUSR,
+ sn->proc_net_rpc,
+ &use_gss_proxy_ops, net);
+ if (!*p)
+ return -ENOMEM;
+ init_gssp_clnt(sn);
+ return 0;
+}
+
+static void destroy_use_gss_proxy_proc_entry(struct net *net)
+{
+ struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
+
+ if (sn->use_gssp_proc) {
+ remove_proc_entry("use-gss-proxy", sn->proc_net_rpc);
+ clear_gssp_clnt(sn);
+ }
+}
+
+#endif /* CONFIG_PROC_FS */
+
/*
* Accept an rpcsec packet.
* If context establishment, punt to user space
@@ -1143,7 +1463,10 @@ svcauth_gss_accept(struct svc_rqst *rqstp, __be32 *authp)
switch (gc->gc_proc) {
case RPC_GSS_PROC_INIT:
case RPC_GSS_PROC_CONTINUE_INIT:
- return svcauth_gss_handle_init(rqstp, gc, authp);
+ if (use_gss_proxy(SVC_NET(rqstp)))
+ return svcauth_gss_proxy_init(rqstp, gc, authp);
+ else
+ return svcauth_gss_legacy_init(rqstp, gc, authp);
case RPC_GSS_PROC_DATA:
case RPC_GSS_PROC_DESTROY:
/* Look up the context, and check the verifier: */
@@ -1518,7 +1841,12 @@ gss_svc_init_net(struct net *net)
rv = rsi_cache_create_net(net);
if (rv)
goto out1;
+ rv = create_use_gss_proxy_proc_entry(net);
+ if (rv)
+ goto out2;
return 0;
+out2:
+ destroy_use_gss_proxy_proc_entry(net);
out1:
rsc_cache_destroy_net(net);
return rv;
@@ -1527,6 +1855,7 @@ out1:
void
gss_svc_shutdown_net(struct net *net)
{
+ destroy_use_gss_proxy_proc_entry(net);
rsi_cache_destroy_net(net);
rsc_cache_destroy_net(net);
}
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index c8193ce..8f68c28 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -689,6 +689,7 @@ rpc_release_client(struct rpc_clnt *clnt)
if (atomic_dec_and_test(&clnt->cl_count))
rpc_free_auth(clnt);
}
+EXPORT_SYMBOL_GPL(rpc_release_client);
/**
* rpc_bind_new_program - bind a new RPC program to an existing client
diff --git a/net/sunrpc/netns.h b/net/sunrpc/netns.h
index ce7bd44..7111a4c 100644
--- a/net/sunrpc/netns.h
+++ b/net/sunrpc/netns.h
@@ -23,6 +23,12 @@ struct sunrpc_net {
struct rpc_clnt *rpcb_local_clnt4;
spinlock_t rpcb_clnt_lock;
unsigned int rpcb_users;
+
+ struct mutex gssp_lock;
+ wait_queue_head_t gssp_wq;
+ struct rpc_clnt *gssp_clnt;
+ int use_gss_proxy;
+ struct proc_dir_entry *use_gssp_proc;
};
extern int sunrpc_net_id;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: [PATCH 1/6] SUNRPC: make AF_LOCAL connect synchronous
2013-02-21 16:38 ` [PATCH 1/6] SUNRPC: make AF_LOCAL connect synchronous J. Bruce Fields
@ 2013-02-21 18:17 ` Myklebust, Trond
2013-02-21 19:48 ` J. Bruce Fields
0 siblings, 1 reply; 21+ messages in thread
From: Myklebust, Trond @ 2013-02-21 18:17 UTC (permalink / raw)
To: J. Bruce Fields; +Cc: linux-nfs, chuck.lever, simo
On Thu, 2013-02-21 at 11:38 -0500, J. Bruce Fields wrote:
> From: "J. Bruce Fields" <bfields@redhat.com>
>
> It doesn't appear that anyone actually needs to connect asynchronously.
>
> Also, using a workqueue for the connect means we lose the namespace
> information from the original process. This is a problem since there's
> no way to explicitly pass in a filesystem namespace for resolution of an
> AF_LOCAL address.
>
> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
> ---
> net/sunrpc/xprtsock.c | 35 +++++++++++++++++++++++++++--------
> 1 file changed, 27 insertions(+), 8 deletions(-)
>
> diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
> index bbc0915..b1df874 100644
> --- a/net/sunrpc/xprtsock.c
> +++ b/net/sunrpc/xprtsock.c
> @@ -1866,13 +1866,9 @@ static int xs_local_finish_connecting(struct rpc_xprt *xprt,
> * @xprt: RPC transport to connect
> * @transport: socket transport to connect
> * @create_sock: function to create a socket of the correct type
> - *
> - * Invoked by a work queue tasklet.
> */
> -static void xs_local_setup_socket(struct work_struct *work)
> +static void xs_local_setup_socket(struct sock_xprt *transport)
> {
> - struct sock_xprt *transport =
> - container_of(work, struct sock_xprt, connect_worker.work);
> struct rpc_xprt *xprt = &transport->xprt;
> struct socket *sock;
> int status = -EIO;
> @@ -1919,6 +1915,31 @@ out:
> current->flags &= ~PF_FSTRANS;
> }
>
> +static void xs_local_connect(struct rpc_task *task)
> +{
> + struct rpc_xprt *xprt = task->tk_xprt;
> + struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);
> + unsigned long timeout;
> +
> + if (RPC_IS_ASYNC(task))
> + rpc_exit(task, -ENOTCONN);
Needs a "return"...
> +
> + if (transport->sock != NULL && !RPC_IS_SOFTCONN(task)) {
> + dprintk("RPC: xs_connect delayed xprt %p for %lu "
> + "seconds\n",
> + xprt, xprt->reestablish_timeout / HZ);
> + timeout = xprt->reestablish_timeout;
> + xprt->reestablish_timeout <<= 1;
> + if (xprt->reestablish_timeout < XS_TCP_INIT_REEST_TO)
> + xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO;
> + if (xprt->reestablish_timeout > XS_TCP_MAX_REEST_TO)
> + xprt->reestablish_timeout = XS_TCP_MAX_REEST_TO;
> + rpc_delay(task, timeout);
This too needs to exit in order to sleep.
> + } else
> + dprintk("RPC: xs_connect scheduled xprt %p\n", xprt);
> + xs_local_setup_socket(transport);
> +}
> +
> #ifdef CONFIG_SUNRPC_SWAP
> static void xs_set_memalloc(struct rpc_xprt *xprt)
> {
> @@ -2454,7 +2475,7 @@ static struct rpc_xprt_ops xs_local_ops = {
> .alloc_slot = xprt_alloc_slot,
> .rpcbind = xs_local_rpcbind,
> .set_port = xs_local_set_port,
> - .connect = xs_connect,
> + .connect = xs_local_connect,
> .buf_alloc = rpc_malloc,
> .buf_free = rpc_free,
> .send_request = xs_local_send_request,
> @@ -2627,8 +2648,6 @@ static struct rpc_xprt *xs_setup_local(struct xprt_create *args)
> goto out_err;
> }
> xprt_set_bound(xprt);
> - INIT_DELAYED_WORK(&transport->connect_worker,
> - xs_local_setup_socket);
> xs_format_peer_addresses(xprt, "local", RPCBIND_NETID_LOCAL);
> break;
> default:
--
Trond Myklebust
Linux NFS client maintainer
NetApp
Trond.Myklebust@netapp.com
www.netapp.com
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 5/6] SUNRPC: Add RPC based upcall mechanism for RPCGSS auth
2013-02-21 16:38 ` [PATCH 5/6] SUNRPC: Add RPC based upcall mechanism for RPCGSS auth J. Bruce Fields
@ 2013-02-21 18:35 ` Myklebust, Trond
2013-02-21 19:58 ` J. Bruce Fields
` (2 more replies)
0 siblings, 3 replies; 21+ messages in thread
From: Myklebust, Trond @ 2013-02-21 18:35 UTC (permalink / raw)
To: J. Bruce Fields; +Cc: linux-nfs, chuck.lever, simo
On Thu, 2013-02-21 at 11:38 -0500, J. Bruce Fields wrote:
> From: Simo Sorce <simo@redhat.com>
>
> This patch implements a sunrpc client to use the services of the gssproxy
> userspace daemon.
>
> In particular it allows to perform calls in user space using an RPC
> call instead of custom hand-coded upcall/downcall messages.
>
> Currently only accept_sec_context is implemented as that is all is needed for
> the server case.
>
> File server modules like NFS and CIFS can use full gssapi services this way,
> once init_sec_context is also implemented.
>
> For the NFS server case this code allow to lift the limit of max 2k krb5
> tickets. This limit is prevents legitimate kerberos deployments from using krb5
> authentication with the Linux NFS server as they have normally ticket that are
> many kilobytes large.
>
> It will also allow to lift the limitation on the size of the credential set
> (uid,gid,gids) passed down from user space for users that have very many groups
> associated. Currently the downcall mechanism used by rpc.svcgssd is limited
> to around 2k secondary groups of the 65k allowed by kernel structures.
>
> Signed-off-by: Simo Sorce <simo@redhat.com>
> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
> ---
> net/sunrpc/auth_gss/Makefile | 3 +-
> net/sunrpc/auth_gss/gss_rpc_upcall.c | 353 +++++++++++++
> net/sunrpc/auth_gss/gss_rpc_upcall.h | 43 ++
> net/sunrpc/auth_gss/gss_rpc_xdr.c | 906 ++++++++++++++++++++++++++++++++++
> net/sunrpc/auth_gss/gss_rpc_xdr.h | 269 ++++++++++
> 5 files changed, 1573 insertions(+), 1 deletion(-)
> create mode 100644 net/sunrpc/auth_gss/gss_rpc_upcall.c
> create mode 100644 net/sunrpc/auth_gss/gss_rpc_upcall.h
> create mode 100644 net/sunrpc/auth_gss/gss_rpc_xdr.c
> create mode 100644 net/sunrpc/auth_gss/gss_rpc_xdr.h
>
> diff --git a/net/sunrpc/auth_gss/Makefile b/net/sunrpc/auth_gss/Makefile
> index 9e4cb59..14e9e53 100644
> --- a/net/sunrpc/auth_gss/Makefile
> +++ b/net/sunrpc/auth_gss/Makefile
> @@ -5,7 +5,8 @@
> obj-$(CONFIG_SUNRPC_GSS) += auth_rpcgss.o
>
> auth_rpcgss-y := auth_gss.o gss_generic_token.o \
> - gss_mech_switch.o svcauth_gss.o
> + gss_mech_switch.o svcauth_gss.o \
> + gss_rpc_upcall.o gss_rpc_xdr.o
>
> obj-$(CONFIG_RPCSEC_GSS_KRB5) += rpcsec_gss_krb5.o
>
> diff --git a/net/sunrpc/auth_gss/gss_rpc_upcall.c b/net/sunrpc/auth_gss/gss_rpc_upcall.c
> new file mode 100644
> index 0000000..5fd8c91
> --- /dev/null
> +++ b/net/sunrpc/auth_gss/gss_rpc_upcall.c
> @@ -0,0 +1,353 @@
> +/*
> + * linux/net/sunrpc/gss_rpc_upcall.c
> + *
> + * Copyright (C) 2012 Simo Sorce <simo@redhat.com>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> + */
> +
> +#include <linux/types.h>
> +#include <linux/un.h>
> +
> +#include <linux/sunrpc/svcauth.h>
> +#include "gss_rpc_upcall.h"
> +
> +#define GSSPROXY_SOCK_PATHNAME "/var/run/gssproxy.sock"
> +
> +#define GSSPROXY_PROGRAM (400112u)
> +#define GSSPROXY_VERS_1 (1u)
> +
> +DEFINE_MUTEX(gssp_clnt_mutex);
> +struct rpc_clnt *gssp_clnt;
> +
> +/*
> + * Encoding/Decoding functions
> + */
> +
> +enum {
> + GSSX_NULL = 0, /* Unused */
> + GSSX_INDICATE_MECHS = 1,
> + GSSX_GET_CALL_CONTEXT = 2,
> + GSSX_IMPORT_AND_CANON_NAME = 3,
> + GSSX_EXPORT_CRED = 4,
> + GSSX_IMPORT_CRED = 5,
> + GSSX_ACQUIRE_CRED = 6,
> + GSSX_STORE_CRED = 7,
> + GSSX_INIT_SEC_CONTEXT = 8,
> + GSSX_ACCEPT_SEC_CONTEXT = 9,
> + GSSX_RELEASE_HANDLE = 10,
> + GSSX_GET_MIC = 11,
> + GSSX_VERIFY = 12,
> + GSSX_WRAP = 13,
> + GSSX_UNWRAP = 14,
> + GSSX_WRAP_SIZE_LIMIT = 15,
> +};
> +
> +#define PROC(proc, name) \
> +[GSSX_##proc] = { \
> + .p_proc = GSSX_##proc, \
> + .p_encode = (kxdreproc_t)gssx_enc_##name, \
> + .p_decode = (kxdrdproc_t)gssx_dec_##name, \
> + .p_arglen = GSSX_ARG_##name##_sz, \
> + .p_replen = GSSX_RES_##name##_sz, \
> + .p_statidx = GSSX_##proc, \
> + .p_name = #proc, \
> +}
> +
> +struct rpc_procinfo gssp_procedures[] = {
> + PROC(INDICATE_MECHS, indicate_mechs),
> + PROC(GET_CALL_CONTEXT, get_call_context),
> + PROC(IMPORT_AND_CANON_NAME, import_and_canon_name),
> + PROC(EXPORT_CRED, export_cred),
> + PROC(IMPORT_CRED, import_cred),
> + PROC(ACQUIRE_CRED, acquire_cred),
> + PROC(STORE_CRED, store_cred),
> + PROC(INIT_SEC_CONTEXT, init_sec_context),
> + PROC(ACCEPT_SEC_CONTEXT, accept_sec_context),
> + PROC(RELEASE_HANDLE, release_handle),
> + PROC(GET_MIC, get_mic),
> + PROC(VERIFY, verify),
> + PROC(WRAP, wrap),
> + PROC(UNWRAP, unwrap),
> + PROC(WRAP_SIZE_LIMIT, wrap_size_limit),
> +};
> +
> +
> +
> +/*
> + * Common transport functions
> + */
> +
> +static const struct rpc_program gssp_program;
> +
> +static int gssp_rpc_create(struct net *net, struct rpc_clnt **_clnt)
> +{
> + static const struct sockaddr_un gssp_localaddr = {
> + .sun_family = AF_LOCAL,
> + .sun_path = GSSPROXY_SOCK_PATHNAME,
> + };
> + struct rpc_create_args args = {
> + .net = net,
> + .protocol = XPRT_TRANSPORT_LOCAL,
> + .address = (struct sockaddr *)&gssp_localaddr,
> + .addrsize = sizeof(gssp_localaddr),
> + .servername = "localhost",
> + .program = &gssp_program,
> + .version = GSSPROXY_VERS_1,
> + .authflavor = RPC_AUTH_NULL,
> + .flags = RPC_CLNT_CREATE_NOPING,
> + };
> + struct rpc_clnt *clnt;
> + int result = 0;
> +
> + clnt = rpc_create(&args);
> + if (IS_ERR(clnt)) {
> + dprintk("RPC: failed to create AF_LOCAL gssproxy "
> + "client (errno %ld).\n", PTR_ERR(clnt));
> + result = -PTR_ERR(clnt);
> + *_clnt = NULL;
> + goto out;
> + }
> +
> + dprintk("RPC: created new gssp local client (gssp_local_clnt: "
> + "%p)\n", clnt);
> + *_clnt = clnt;
> +
> +out:
> + return result;
> +}
> +
> +static struct rpc_clnt *get_clnt(struct net *net, bool global_clnt)
> +{
> + struct rpc_clnt *clnt;
> + int err;
> +
> + mutex_lock(&gssp_clnt_mutex);
> +
> + if (global_clnt && gssp_clnt)
> + return gssp_clnt;
Ehem.... mutex_unlock()? Better yet, add an 'out:' label below, and
replace all the 'return' statements with gotos...
> +
> + err = gssp_rpc_create(net, &clnt);
> + if (err) {
> + mutex_unlock(&gssp_clnt_mutex);
> + return NULL;
> + }
> + if (global_clnt)
> + gssp_clnt = clnt;
> +
out:
> + mutex_unlock(&gssp_clnt_mutex);
> + return clnt;
> +}
> +
> +static void kill_clnt(struct rpc_clnt *clnt)
> +{
> + BUG_ON(clnt == NULL);
> +
> + mutex_lock(&gssp_clnt_mutex);
> +
> + rpc_shutdown_client(clnt);
> + if (clnt == gssp_clnt)
> + gssp_clnt = NULL;
> +
> + mutex_unlock(&gssp_clnt_mutex);
> +}
> +
> +static int gssp_call(struct net *net, struct rpc_message *msg)
> +{
> + struct rpc_clnt *clnt;
> + int status;
> +
> + /* for now always create new one */
> + clnt = get_clnt(net, false);
> +
> + status = rpc_call_sync(clnt, msg, 0);
> + if (status < 0) {
> + dprintk("gssp: rpc_call returned error %d\n", -status);
> + switch (status) {
> + case -EPROTONOSUPPORT:
> + status = -EINVAL;
> + break;
> + case -ECONNREFUSED:
> + case -ETIMEDOUT:
> + case -ENOTCONN:
> + status = -EAGAIN;
> + break;
> + case -ERESTARTSYS:
> + if (signalled ())
> + status = -EINTR;
> + break;
> + default:
> + break;
> + }
> + }
> +
> + /* always kill connection for now */
> + kill_clnt(clnt);
> +
> + return status;
> +}
> +
> +
> +/*
> + * Public functions
> + */
> +
> +/* numbers somewhat arbitrary but large enough for current needs */
> +#define GSSX_MAX_OUT_HANDLE 128
> +#define GSSX_MAX_MECH_OID 16
> +#define GSSX_MAX_SRC_PRINC 256
> +#define GSSX_KMEMBUF (GSSX_max_output_handle_sz + \
> + GSSX_max_oid_sz + \
> + GSSX_max_princ_sz + \
> + sizeof(struct svc_cred))
> +
> +int gssp_accept_sec_context_upcall(struct net *net,
> + struct gssp_upcall_data *data)
> +{
> + struct gssx_arg_accept_sec_context arg;
> + struct gssx_res_accept_sec_context res;
> + struct gssx_ctx ctxh;
> + struct gssx_ctx rctxh;
> + struct gssx_cred delegcred;
> + struct rpc_message msg = {
> + .rpc_proc = &gssp_procedures[GSSX_ACCEPT_SEC_CONTEXT],
> + .rpc_argp = &arg,
> + .rpc_resp = &res,
> + .rpc_cred = NULL, /* FIXME ? */
> + };
> + struct xdr_netobj client_name = { 0 , NULL };
> + int ret;
> +
> + /* fill in arg */
> + memset(&arg, 0, sizeof(arg));
> + if (data->in_handle.len != 0) {
> + memset(&ctxh, 0, sizeof(ctxh));
> + arg.context_handle = &ctxh;
> + ctxh.state = data->in_handle;
> + }
> + arg.input_token = data->in_token;
> +
> + /* use nfs/ for targ_name ? */
> +
> + /* prepare res */
> + memset(&res, 0, sizeof(res));
> + memset(&rctxh, 0, sizeof(rctxh));
> + res.context_handle = &rctxh;
> +
> + /* pass in the max length we expect for each of these
> + * buffers but let the xdr code kmalloc them */
> + rctxh.exported_context_token.len = GSSX_max_output_handle_sz;
> + rctxh.mech.len = GSSX_max_oid_sz;
> + rctxh.src_name.display_name.len = GSSX_max_princ_sz;
> +
> + res.output_token = &data->out_token;
> + res.output_token->len = GSSX_max_output_token_sz;
C99 initialisers for arg, and res would clean this up nicely... Main
question is how much stack does all the above eat?
> +
> + /* we are never interested in delegated credentials */
> + memset(&delegcred, 0, sizeof(delegcred));
> + res.delegated_cred_handle = &delegcred;
> +
> + /* make upcall */
> + ret = gssp_call(net, &msg);
> +
> + /* we need to fetch all data even in case of error so
> + * that we can free special strctures is they have been allocated */
> + data->major_status = res.status.major_status;
> + data->minor_status = res.status.minor_status;
> + if (res.context_handle) {
> + data->out_handle = rctxh.exported_context_token;
> + data->mech_oid = rctxh.mech;
> + client_name = rctxh.src_name.display_name;
> + }
> +
> + if (res.options.count == 1) {
> + gssx_buffer *value = &res.options.data[0].value;
> + /* Currently we only decode CREDS_VALUE, if we add
> + * anything else we'll have to loop and match on the
> + * option name */
> + if (value->len == 1) {
> + /* steal group info from struct svc_cred */
> + data->creds = *(struct svc_cred *)value->data;
> + data->found_creds = 1;
> + }
> + /* whether we use it or not, free data */
> + kfree(value->data);
> + }
> +
> + if (res.options.count != 0) {
> + kfree(res.options.data);
> + }
> +
> + /* convert to GSS_NT_HOSTBASED_SERVICE form and set into creds */
> + if (data->found_creds && client_name.data != NULL) {
> + char *c;
> +
> + data->creds.cr_principal = kstrndup(client_name.data,
> + client_name.len, GFP_KERNEL);
> + if (data->creds.cr_principal) {
> + /* terminate and remove realm part */
> + c = strchr(data->creds.cr_principal, '@');
> + if (c) {
> + *c = '\0';
> +
> + /* change service-hostname delimiter */
> + c = strchr(data->creds.cr_principal, '/');
> + if (c) *c = '@';
> + }
> + if (!c) {
> + /* not a service principal */
> + kfree(data->creds.cr_principal);
> + data->creds.cr_principal = NULL;
> + }
> + }
> + }
> + kfree(client_name.data);
> +
> + return ret;
> +}
> +
> +void gssp_free_upcall_data(struct gssp_upcall_data *data)
> +{
> + kfree(data->in_handle.data);
> + kfree(data->out_handle.data);
> + kfree(data->out_token.data);
> + kfree(data->mech_oid.data);
> + free_svc_cred(&data->creds);
> +}
> +
> +/*
> + * Initialization stuff
> + */
> +
> +static const struct rpc_version gssp_version1 = {
> + .number = GSSPROXY_VERS_1,
> + .nrprocs = ARRAY_SIZE(gssp_procedures),
> + .procs = gssp_procedures,
> +};
> +
> +static const struct rpc_version *gssp_version[] = {
> + NULL,
> + &gssp_version1,
> +};
> +
> +static struct rpc_stat gssp_stats;
> +
> +static const struct rpc_program gssp_program = {
> + .name = "gssproxy",
> + .number = GSSPROXY_PROGRAM,
> + .nrvers = ARRAY_SIZE(gssp_version),
> + .version = gssp_version,
> + .stats = &gssp_stats,
> +};
> diff --git a/net/sunrpc/auth_gss/gss_rpc_upcall.h b/net/sunrpc/auth_gss/gss_rpc_upcall.h
> new file mode 100644
> index 0000000..83aca5a
> --- /dev/null
> +++ b/net/sunrpc/auth_gss/gss_rpc_upcall.h
> @@ -0,0 +1,43 @@
> +/*
> + * linux/net/sunrpc/gss_rpc_upcall.h
> + *
> + * Copyright (C) 2012 Simo Sorce <simo@redhat.com>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> + */
> +
> +#ifndef _GSS_RPC_UPCALL_H
> +#define _GSS_RPC_UPCALL_H
> +
> +#include <linux/sunrpc/auth_gss.h>
> +#include "gss_rpc_xdr.h"
> +
> +struct gssp_upcall_data {
> + struct xdr_netobj in_handle;
> + struct gssp_in_token in_token;
> + struct xdr_netobj out_handle;
> + struct xdr_netobj out_token;
> + struct xdr_netobj mech_oid;
> + struct svc_cred creds;
> + int found_creds;
> + int major_status;
> + int minor_status;
> +};
> +
> +int gssp_accept_sec_context_upcall(struct net *net,
> + struct gssp_upcall_data *data);
> +void gssp_free_upcall_data(struct gssp_upcall_data *data);
> +
> +#endif /* _GSS_RPC_UPCALL_H */
> diff --git a/net/sunrpc/auth_gss/gss_rpc_xdr.c b/net/sunrpc/auth_gss/gss_rpc_xdr.c
> new file mode 100644
> index 0000000..490c80b
> --- /dev/null
> +++ b/net/sunrpc/auth_gss/gss_rpc_xdr.c
> @@ -0,0 +1,906 @@
> +/*
> + * GSS Proxy upcall module
> + *
> + * Copyright (C) 2012 Simo Sorce <simo@redhat.com>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> + */
> +
> +#include <linux/sunrpc/svcauth.h>
> +#include "gss_rpc_xdr.h"
> +
> +static bool gssx_check_pointer(struct xdr_stream *xdr)
> +{
> + __be32 *p;
> +
> + p = xdr_reserve_space(xdr, 4);
> + if (unlikely(p == NULL))
> + return -ENOSPC;
> + return *p?true:false;
> +}
> +
> +static int gssx_enc_bool(struct xdr_stream *xdr, int v)
> +{
> + __be32 *p;
> +
> + p = xdr_reserve_space(xdr, 4);
> + if (unlikely(p == NULL))
> + return -ENOSPC;
> + *p = v ? xdr_one : xdr_zero;
> + return 0;
> +}
> +
> +static int gssx_dec_bool(struct xdr_stream *xdr, u32 *v)
> +{
> + __be32 *p;
> +
> + p = xdr_inline_decode(xdr, 4);
> + if (unlikely(p == NULL))
> + return -ENOSPC;
> + *v = be32_to_cpu(*p);
> + return 0;
> +}
> +
> +static int gssx_enc_buffer(struct xdr_stream *xdr,
> + gssx_buffer *buf)
> +{
> + __be32 *p;
> +
> + p = xdr_reserve_space(xdr, sizeof(u32) + buf->len);
> + if (!p)
> + return -ENOSPC;
> + xdr_encode_opaque(p, buf->data, buf->len);
> + return 0;
> +}
> +
> +static int gssx_enc_in_token(struct xdr_stream *xdr,
> + struct gssp_in_token *in)
> +{
> + __be32 *p;
> +
> + p = xdr_reserve_space(xdr, 4);
> + if (!p)
> + return -ENOSPC;
> + *p = cpu_to_be32(in->page_len);
> +
> + /* all we need to do is to write pages */
> + xdr_write_pages(xdr, in->pages, in->page_base, in->page_len);
> +
> + return 0;
> +}
> +
> +
> +static int gssx_dec_buffer(struct xdr_stream *xdr,
> + gssx_buffer *buf)
> +{
> + u32 length;
> + __be32 *p;
> +
> + p = xdr_inline_decode(xdr, 4);
> + if (unlikely(p == NULL))
> + return -ENOSPC;
> +
> + length = be32_to_cpup(p);
> + p = xdr_inline_decode(xdr, length);
combine for efficiency with the 4 byte allocation above.
> + if (unlikely(p == NULL))
> + return -ENOSPC;
> +
> + if (buf->len == 0) {
> + /* we intentionally are not interested in this buffer */
> + return 0;
> + }
> + if (length > buf->len)
> + return -ENOSPC;
> +
> + if (!buf->data) {
> + buf->data = kmemdup(p, length, GFP_KERNEL);
> + if (!buf->data)
> + return -ENOMEM;
> + } else {
> + memcpy(buf->data, p, length);
> + }
> + buf->len = length;
> + return 0;
> +}
> +
> +static int gssx_enc_option(struct xdr_stream *xdr,
> + struct gssx_option *opt)
> +{
> + int err;
> +
> + err = gssx_enc_buffer(xdr, &opt->option);
> + if (err)
> + return err;
> + err = gssx_enc_buffer(xdr, &opt->value);
> + return err;
> +}
> +
> +static int gssx_dec_option(struct xdr_stream *xdr,
> + struct gssx_option *opt)
> +{
> + int err;
> +
> + err = gssx_dec_buffer(xdr, &opt->option);
> + if (err)
> + return err;
> + err = gssx_dec_buffer(xdr, &opt->value);
> + return err;
> +}
> +
> +static int dummy_enc_opt_array(struct xdr_stream *xdr,
> + struct gssx_option_array *oa)
> +{
> + __be32 *p;
> +
> + if (oa->count != 0)
> + return -EINVAL;
> +
> + p = xdr_reserve_space(xdr, 4);
> + if (!p)
> + return -ENOSPC;
> + *p = 0;
> +
> + return 0;
> +}
> +
> +static int dummy_dec_opt_array(struct xdr_stream *xdr,
> + struct gssx_option_array *oa)
> +{
> + struct gssx_option dummy;
> + u32 count, i;
> + __be32 *p;
> +
> + p = xdr_inline_decode(xdr, 4);
> + if (unlikely(p == NULL))
> + return -ENOSPC;
> + count = be32_to_cpup(p++);
> + memset(&dummy, 0, sizeof(dummy));
> + for (i = 0; i < count; i++) {
> + gssx_dec_option(xdr, &dummy);
> + }
> +
> + oa->count = 0;
> + oa->data = NULL;
> + return 0;
> +}
> +
> +static int get_s32(void **p, void *max, s32 *res)
> +{
> + void *base = *p;
> + void *next = (void *)((char *)base + sizeof(s32));
> + if (unlikely(next > max || next < base))
> + return -EINVAL;
> + memcpy(res, base, sizeof(s32));
> + *p = next;
> + return 0;
> +}
> +
> +static int gssx_dec_linux_creds(struct xdr_stream *xdr,
> + struct svc_cred *creds)
> +{
> + u32 length;
> + __be32 *p;
> + void *q, *end;
> + s32 tmp;
> + int N, i, err;
> +
> + p = xdr_inline_decode(xdr, 4);
> + if (unlikely(p == NULL))
> + return -ENOSPC;
> +
> + length = be32_to_cpup(p);
> +
> + /* FIXME: we do not want to use the scratch buffer for this one
> + * may need to use functions that allows us to access an io vector
> + * directly */
> + p = xdr_inline_decode(xdr, length);
Ditto. Combine with the 4 byte allocation above.
> + if (unlikely(p == NULL))
> + return -ENOSPC;
> +
> + q = p;
> + end = q + length;
> +
> + /* uid */
> + err = get_s32(&q, end, &tmp);
> + if (err)
> + return err;
> + creds->cr_uid = tmp;
> +
> + /* gid */
> + err = get_s32(&q, end, &tmp);
> + if (err)
> + return err;
> + creds->cr_gid = tmp;
> +
> + /* number of additional gid's */
> + err = get_s32(&q, end, &tmp);
> + if (err)
> + return err;
> + N = tmp;
> + creds->cr_group_info = groups_alloc(N);
> + if (creds->cr_group_info == NULL)
> + return -ENOMEM;
> +
> + /* gid's */
> + for (i = 0; i < N; i++) {
> + err = get_s32(&q, end, &tmp);
> + if (err) {
> + groups_free(creds->cr_group_info);
> + return err;
> + }
> + GROUP_AT(creds->cr_group_info, i) = tmp;
> + }
> +
> + return 0;
> +}
> +
> +static int gssx_dec_option_array(struct xdr_stream *xdr,
> + struct gssx_option_array *oa)
> +{
> + struct svc_cred *creds;
> + u32 count, i;
> + __be32 *p;
> + int err;
> +
> + p = xdr_inline_decode(xdr, 4);
> + if (unlikely(p == NULL))
> + return -ENOSPC;
> + count = be32_to_cpup(p++);
> + if (count != 0) {
> + /* we recognize only 1 currently: CREDS_VALUE */
> + oa->count = 1;
> +
> + oa->data = kmalloc(sizeof(struct gssx_option), GFP_KERNEL);
Sleeping kmallocs inside XDR encode/decode routines is strongly
discouraged. Particularly so for something that can be preallocated.
> + if (!oa->data)
> + return -ENOMEM;
> +
> + creds = kmalloc(sizeof(struct svc_cred), GFP_KERNEL);
Ditto.
> + if (!creds) {
> + kfree(oa->data);
> + return -ENOMEM;
> + }
> +
> + oa->data[0].option.data = CREDS_VALUE;
> + oa->data[0].option.len = sizeof(CREDS_VALUE);
> + oa->data[0].value.data = (void *)creds;
> + oa->data[0].value.len = 0;
> + }
> + for (i = 0; i < count; i++) {
> + gssx_buffer dummy = { 0, NULL };
> + u32 length;
> +
> + /* option buffer */
> + p = xdr_inline_decode(xdr, 4);
> + if (unlikely(p == NULL))
> + return -ENOSPC;
> +
> + length = be32_to_cpup(p);
> + p = xdr_inline_decode(xdr, length);
> + if (unlikely(p == NULL))
> + return -ENOSPC;
> +
> + if (length == sizeof(CREDS_VALUE) &&
> + memcmp(p, CREDS_VALUE, sizeof(CREDS_VALUE)) == 0) {
> + /* We have creds here. parse them */
> + err = gssx_dec_linux_creds(xdr, creds);
> + if (err)
> + return err;
> + oa->data[0].value.len = 1; /* presence */
> + } else {
> + /* consume uninteresting buffer */
> + err = gssx_dec_buffer(xdr, &dummy);
> + if (err)
> + return err;
> + }
> + }
> + return 0;
> +}
> +
> +static int gssx_dec_status(struct xdr_stream *xdr,
> + struct gssx_status *status)
> +{
> + __be32 *p;
> + int err;
> +
> + /* status->major_status */
> + p = xdr_inline_decode(xdr, 8);
> + if (unlikely(p == NULL))
> + return -ENOSPC;
> + p = xdr_decode_hyper(p, &status->major_status);
> +
> + /* status->mech */
> + err = gssx_dec_buffer(xdr, &status->mech);
> + if (err)
> + return err;
> +
> + /* status->minor_status */
> + p = xdr_inline_decode(xdr, 8);
> + if (unlikely(p == NULL))
> + return -ENOSPC;
> + p = xdr_decode_hyper(p, &status->minor_status);
> +
> + /* status->major_status_string */
> + err = gssx_dec_buffer(xdr, &status->major_status_string);
> + if (err)
> + return err;
> +
> + /* status->minor_status_string */
> + err = gssx_dec_buffer(xdr, &status->minor_status_string);
> + if (err)
> + return err;
> +
> + /* status->server_ctx */
> + err = gssx_dec_buffer(xdr, &status->server_ctx);
> + if (err)
> + return err;
> +
> + /* we assume we have no options for now, so simply consume them */
> + /* status->options */
> + err = dummy_dec_opt_array(xdr, &status->options);
> +
> + return err;
> +}
> +
> +static int gssx_enc_call_ctx(struct xdr_stream *xdr,
> + struct gssx_call_ctx *ctx)
> +{
> + struct gssx_option opt;
> + __be32 *p;
> + int err;
> +
> + /* ctx->locale */
> + err = gssx_enc_buffer(xdr, &ctx->locale);
> + if (err)
> + return err;
> +
> + /* ctx->server_ctx */
> + err = gssx_enc_buffer(xdr, &ctx->server_ctx);
> + if (err)
> + return err;
> +
> + /* we always want to ask for lucid contexts */
> + /* ctx->options */
> + p = xdr_reserve_space(xdr, 4);
> + *p = cpu_to_be32(2);
> +
> + /* we want a lucid_v1 context */
> + opt.option.data = LUCID_OPTION;
> + opt.option.len = sizeof(LUCID_OPTION);
> + opt.value.data = LUCID_VALUE;
> + opt.value.len = sizeof(LUCID_VALUE);
> + err = gssx_enc_option(xdr, &opt);
> +
> + /* ..and user creds */
> + opt.option.data = CREDS_OPTION;
> + opt.option.len = sizeof(CREDS_OPTION);
> + opt.value.data = CREDS_VALUE;
> + opt.value.len = sizeof(CREDS_VALUE);
> + err = gssx_enc_option(xdr, &opt);
> +
> + return err;
> +}
> +
> +static int gssx_dec_name_attr(struct xdr_stream *xdr,
> + struct gssx_name_attr *attr)
> +{
> + int err;
> +
> + /* attr->attr */
> + err = gssx_dec_buffer(xdr, &attr->attr);
> + if (err)
> + return err;
> +
> + /* attr->value */
> + err = gssx_dec_buffer(xdr, &attr->value);
> + if (err)
> + return err;
> +
> + /* attr->extensions */
> + err = dummy_dec_opt_array(xdr, &attr->extensions);
> +
> + return err;
> +}
> +
> +static int dummy_enc_nameattr_array(struct xdr_stream *xdr,
> + struct gssx_name_attr_array *naa)
> +{
> + __be32 *p;
> +
> + if (naa->count != 0)
> + return -EINVAL;
> +
> + p = xdr_reserve_space(xdr, 4);
> + if (!p)
> + return -ENOSPC;
> + *p = 0;
> +
> + return 0;
> +}
> +
> +static int dummy_dec_nameattr_array(struct xdr_stream *xdr,
> + struct gssx_name_attr_array *naa)
> +{
> + struct gssx_name_attr dummy;
> + u32 count, i;
> + __be32 *p;
> +
> + p = xdr_inline_decode(xdr, 4);
> + if (unlikely(p == NULL))
> + return -ENOSPC;
> + count = be32_to_cpup(p++);
> + for (i = 0; i < count; i++) {
> + gssx_dec_name_attr(xdr, &dummy);
> + }
> +
> + naa->count = 0;
> + naa->data = NULL;
> + return 0;
> +}
> +
> +static int gssx_enc_name(struct xdr_stream *xdr,
> + struct gssx_name *name)
> +{
> + int err;
> +
> + /* name->display_name */
> + err = gssx_enc_buffer(xdr, &name->display_name);
> + if (err)
> + return err;
> +
> + /* name->name_type */
> + err = gssx_enc_buffer(xdr, &name->name_type);
> + if (err)
> + return err;
> +
> + /* name->exported_name */
> + err = gssx_enc_buffer(xdr, &name->exported_name);
> + if (err)
> + return err;
> +
> + /* name->exported_composite_name */
> + err = gssx_enc_buffer(xdr, &name->exported_composite_name);
> + if (err)
> + return err;
> +
> + /* leave name_attributes empty for now, will add once we have any
> + * to pass up at all */
> + /* name->name_attributes */
> + err = dummy_enc_nameattr_array(xdr, &name->name_attributes);
> + if (err)
> + return err;
> +
> + /* leave options empty for now, will add once we have any options
> + * to pass up at all */
> + /* name->extensions */
> + err = dummy_enc_opt_array(xdr, &name->extensions);
> +
> + return err;
> +}
> +
> +static int gssx_dec_name(struct xdr_stream *xdr,
> + struct gssx_name *name)
> +{
> + int err;
> +
> + /* name->display_name */
> + err = gssx_dec_buffer(xdr, &name->display_name);
> + if (err)
> + return err;
> +
> + /* name->name_type */
> + err = gssx_dec_buffer(xdr, &name->name_type);
> + if (err)
> + return err;
> +
> + /* name->exported_name */
> + err = gssx_dec_buffer(xdr, &name->exported_name);
> + if (err)
> + return err;
> +
> + /* name->exported_composite_name */
> + err = gssx_dec_buffer(xdr, &name->exported_composite_name);
> + if (err)
> + return err;
> +
> + /* we assume we have no attributes for now, so simply consume them */
> + /* name->name_attributes */
> + err = dummy_dec_nameattr_array(xdr, &name->name_attributes);
> + if (err)
> + return err;
> +
> + /* we assume we have no options for now, so simply consume them */
> + /* name->extensions */
> + err = dummy_dec_opt_array(xdr, &name->extensions);
> +
> + return err;
> +}
> +
> +static int gssx_dec_cred_element(struct xdr_stream *xdr,
> + struct gssx_cred_element *el)
> +{
> + __be32 *p;
> + int err;
> +
> + /* el->MN */
> + err = gssx_dec_name(xdr, &el->MN);
> + if (err)
> + return err;
> +
> + /* el->mech */
> + err = gssx_dec_buffer(xdr, &el->mech);
> + if (err)
> + return err;
> +
> + /* el->cred_usage */
> + p = xdr_inline_decode(xdr, 4+8+8);
> + if (!p)
> + return -ENOSPC;
> + el->cred_usage = be32_to_cpup(p++);
> +
> + /* el->initiator_time_rec */
> + p = xdr_decode_hyper(p, &el->initiator_time_rec);
> +
> + /* el->acceptor_time_rec */
> + p = xdr_decode_hyper(p, &el->initiator_time_rec);
> +
> + /* we assume we have no options for now, so simply consume them */
> + /* el->options */
> + err = dummy_dec_opt_array(xdr, &el->options);
> +
> + return err;
> +}
> +
> +static int dummy_enc_credel_array(struct xdr_stream *xdr,
> + struct gssx_cred_element_array *cea)
> +{
> + __be32 *p;
> +
> + if (cea->count != 0)
> + return -EINVAL;
> +
> + p = xdr_reserve_space(xdr, 4);
> + if (!p)
> + return -ENOSPC;
> + *p = 0;
> +
> + return 0;
> +}
> +
> +static int dummy_dec_credel_array(struct xdr_stream *xdr,
> + struct gssx_cred_element_array *cea)
> +{
> + struct gssx_cred_element dummy;
> + u32 count, i;
> + __be32 *p;
> +
> + p = xdr_inline_decode(xdr, 4);
> + if (unlikely(p == NULL))
> + return -ENOSPC;
> + count = be32_to_cpup(p++);
> + for (i = 0; i < count; i++) {
> + gssx_dec_cred_element(xdr, &dummy);
> + }
> +
> + cea->count = 0;
> + cea->data = NULL;
> + return 0;
> +}
> +
> +static int gssx_enc_cred(struct xdr_stream *xdr,
> + struct gssx_cred *cred)
> +{
> + int err;
> +
> + /* cred->desired_name */
> + err = gssx_enc_name(xdr, &cred->desired_name);
> + if (err)
> + return err;
> +
> + /* cred->elements */
> + err = dummy_enc_credel_array(xdr, &cred->elements);
> +
> + /* cred->cred_handle_reference */
> + err = gssx_enc_buffer(xdr, &cred->cred_handle_reference);
> + if (err)
> + return err;
> +
> + /* cred->needs_release */
> + err = gssx_enc_bool(xdr, cred->needs_release);
> +
> + return err;
> +}
> +
> +static int gssx_dec_cred(struct xdr_stream *xdr,
> + struct gssx_cred *cred)
> +{
> + int err;
> +
> + /* cred->desired_name */
> + err = gssx_dec_name(xdr, &cred->desired_name);
> + if (err)
> + return err;
> +
> + /* cred->elements */
> + err = dummy_dec_credel_array(xdr, &cred->elements);
> +
> + /* cred->cred_handle_reference */
> + err = gssx_dec_buffer(xdr, &cred->cred_handle_reference);
> + if (err)
> + return err;
> +
> + /* cred->needs_release */
> + err = gssx_dec_bool(xdr, &cred->needs_release);
> +
> + return err;
> +}
> +
> +static int gssx_enc_ctx(struct xdr_stream *xdr,
> + struct gssx_ctx *ctx)
> +{
> + __be32 *p;
> + int err;
> +
> + /* ctx->exported_context_token */
> + err = gssx_enc_buffer(xdr, &ctx->exported_context_token);
> + if (err)
> + return err;
> +
> + /* ctx->state */
> + err = gssx_enc_buffer(xdr, &ctx->state);
> + if (err)
> + return err;
> +
> + /* ctx->need_release */
> + err = gssx_enc_bool(xdr, ctx->need_release);
> + if (err)
> + return err;
> +
> + /* ctx->mech */
> + err = gssx_enc_buffer(xdr, &ctx->mech);
> + if (err)
> + return err;
> +
> + /* ctx->src_name */
> + err = gssx_enc_name(xdr, &ctx->src_name);
> + if (err)
> + return err;
> +
> + /* ctx->targ_name */
> + err = gssx_enc_name(xdr, &ctx->targ_name);
> + if (err)
> + return err;
> +
> + /* ctx->lifetime */
> + p = xdr_reserve_space(xdr, 8+8);
> + if (!p)
> + return -ENOSPC;
> + p = xdr_encode_hyper(p, ctx->lifetime);
> +
> + /* ctx->ctx_flags */
> + p = xdr_encode_hyper(p, ctx->ctx_flags);
> +
> + /* ctx->locally_initiated */
> + err = gssx_enc_bool(xdr, ctx->locally_initiated);
> + if (err)
> + return err;
> +
> + /* ctx->open */
> + err = gssx_enc_bool(xdr, ctx->open);
> + if (err)
> + return err;
> +
> + /* leave options empty for now, will add once we have any options
> + * to pass up at all */
> + /* ctx->options */
> + err = dummy_enc_opt_array(xdr, &ctx->options);
> +
> + return err;
> +}
> +
> +static int gssx_dec_ctx(struct xdr_stream *xdr,
> + struct gssx_ctx *ctx)
> +{
> + __be32 *p;
> + int err;
> +
> + /* ctx->exported_context_token */
> + err = gssx_dec_buffer(xdr, &ctx->exported_context_token);
> + if (err)
> + return err;
> +
> + /* ctx->state */
> + err = gssx_dec_buffer(xdr, &ctx->state);
> + if (err)
> + return err;
> +
> + /* ctx->need_release */
> + err = gssx_dec_bool(xdr, &ctx->need_release);
> + if (err)
> + return err;
> +
> + /* ctx->mech */
> + err = gssx_dec_buffer(xdr, &ctx->mech);
> + if (err)
> + return err;
> +
> + /* ctx->src_name */
> + err = gssx_dec_name(xdr, &ctx->src_name);
> + if (err)
> + return err;
> +
> + /* ctx->targ_name */
> + err = gssx_dec_name(xdr, &ctx->targ_name);
> + if (err)
> + return err;
> +
> + /* ctx->lifetime */
> + p = xdr_inline_decode(xdr, 8+8);
> + if (unlikely(p == NULL))
> + return -ENOSPC;
> + p = xdr_decode_hyper(p, &ctx->lifetime);
> +
> + /* ctx->ctx_flags */
> + p = xdr_decode_hyper(p, &ctx->ctx_flags);
> +
> + /* ctx->locally_initiated */
> + err = gssx_dec_bool(xdr, &ctx->locally_initiated);
> + if (err)
> + return err;
> +
> + /* ctx->open */
> + err = gssx_dec_bool(xdr, &ctx->open);
> + if (err)
> + return err;
> +
> + /* we assume we have no options for now, so simply consume them */
> + /* ctx->options */
> + err = dummy_dec_opt_array(xdr, &ctx->options);
> +
> + return err;
> +}
> +
> +static int gssx_enc_cb(struct xdr_stream *xdr, struct gssx_cb *cb)
> +{
> + __be32 *p;
> + int err;
> +
> + /* cb->initiator_addrtype */
> + p = xdr_reserve_space(xdr, 8);
> + if (!p)
> + return -ENOSPC;
> + p = xdr_encode_hyper(p, cb->initiator_addrtype);
> +
> + /* cb->initiator_address */
> + err = gssx_enc_buffer(xdr, &cb->initiator_address);
> + if (err)
> + return err;
> +
> + /* cb->acceptor_addrtype */
> + p = xdr_reserve_space(xdr, 8);
> + if (!p)
> + return -ENOSPC;
> + p = xdr_encode_hyper(p, cb->acceptor_addrtype);
> +
> + /* cb->acceptor_address */
> + err = gssx_enc_buffer(xdr, &cb->acceptor_address);
> + if (err)
> + return err;
> +
> + /* cb->application_data */
> + err = gssx_enc_buffer(xdr, &cb->application_data);
> +
> + return err;
> +}
> +
> +void gssx_enc_accept_sec_context(struct rpc_rqst *req,
> + struct xdr_stream *xdr,
> + struct gssx_arg_accept_sec_context *arg)
> +{
> + int err;
> +
> + err = gssx_enc_call_ctx(xdr, &arg->call_ctx);
> + if (err)
> + goto done;
> +
> + /* arg->context_handle */
> + if (arg->context_handle) {
> + err = gssx_enc_ctx(xdr, arg->context_handle);
> + if (err)
> + goto done;
> + } else {
> + err = gssx_enc_bool(xdr, 0);
> + }
> +
> + /* arg->cred_handle */
> + if (arg->cred_handle) {
> + err = gssx_enc_cred(xdr, arg->cred_handle);
> + if (err)
> + goto done;
> + } else {
> + err = gssx_enc_bool(xdr, 0);
> + }
> +
> + /* arg->input_token */
> + err = gssx_enc_in_token(xdr, &arg->input_token);
> + if (err)
> + goto done;
> +
> + /* arg->input_cb */
> + if (arg->input_cb) {
> + err = gssx_enc_cb(xdr, arg->input_cb);
> + if (err)
> + goto done;
> + } else {
> + err = gssx_enc_bool(xdr, 0);
> + }
> +
> + err = gssx_enc_bool(xdr, arg->ret_deleg_cred);
> + if (err)
> + goto done;
> +
> + /* leave options empty for now, will add once we have any options
> + * to pass up at all */
> + /* arg->options */
> + err = dummy_enc_opt_array(xdr, &arg->options);
> +
> +done:
> + if (err)
> + dprintk("RPC: gssx_enc_accept_sec_context: %d\n", err);
> +}
> +
> +int gssx_dec_accept_sec_context(struct rpc_rqst *rqstp,
> + struct xdr_stream *xdr,
> + struct gssx_res_accept_sec_context *res)
> +{
> + int err;
> +
> + /* res->status */
> + err = gssx_dec_status(xdr, &res->status);
> + if (err)
> + return err;
> +
> + /* res->context_handle */
> + if (gssx_check_pointer(xdr)) {
> + err = gssx_dec_ctx(xdr, res->context_handle);
> + if (err)
> + return err;
> + } else {
> + res->context_handle = NULL;
> + }
> +
> + /* res->output_token */
> + if (gssx_check_pointer(xdr)) {
> + err = gssx_dec_buffer(xdr, res->output_token);
> + if (err)
> + return err;
> + } else {
> + res->output_token = NULL;
> + }
> +
> + /* res->delegated_cred_handle */
> + if (gssx_check_pointer(xdr)) {
> + err = gssx_dec_cred(xdr, res->delegated_cred_handle);
> + if (err)
> + return err;
> + } else {
> + res->delegated_cred_handle = NULL;
> + }
> +
> + /* we assume we have no options for now, so simply consume them */
> + /* res->options */
> + err = gssx_dec_option_array(xdr, &res->options);
> +
> + return err;
> +}
> diff --git a/net/sunrpc/auth_gss/gss_rpc_xdr.h b/net/sunrpc/auth_gss/gss_rpc_xdr.h
> new file mode 100644
> index 0000000..9256a58
> --- /dev/null
> +++ b/net/sunrpc/auth_gss/gss_rpc_xdr.h
> @@ -0,0 +1,269 @@
> +/*
> + * GSS Proxy upcall module
> + *
> + * Copyright (C) 2012 Simo Sorce <simo@redhat.com>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> + */
> +
> +#ifndef _LINUX_GSS_RPC_XDR_H
> +#define _LINUX_GSS_RPC_XDR_H
> +
> +#include <linux/sunrpc/xdr.h>
> +#include <linux/sunrpc/clnt.h>
> +#include <linux/sunrpc/xprtsock.h>
> +
> +#ifdef RPC_DEBUG
> +# define RPCDBG_FACILITY RPCDBG_AUTH
> +#endif
> +
> +#define LUCID_OPTION "exported_context_type"
> +#define LUCID_VALUE "linux_lucid_v1"
> +#define CREDS_OPTION "exported_creds_type"
> +#define CREDS_VALUE "linux_creds_v1"
> +
> +typedef struct xdr_netobj gssx_buffer;
> +typedef struct xdr_netobj utf8string;
> +typedef struct xdr_netobj gssx_OID;
> +
> +enum gssx_cred_usage {
> + GSSX_C_INITIATE = 1,
> + GSSX_C_ACCEPT = 2,
> + GSSX_C_BOTH = 3,
> +};
> +
> +struct gssx_option {
> + gssx_buffer option;
> + gssx_buffer value;
> +};
> +
> +struct gssx_option_array {
> + u32 count;
> + struct gssx_option *data;
> +};
> +
> +struct gssx_status {
> + u64 major_status;
> + gssx_OID mech;
> + u64 minor_status;
> + utf8string major_status_string;
> + utf8string minor_status_string;
> + gssx_buffer server_ctx;
> + struct gssx_option_array options;
> +};
> +
> +struct gssx_call_ctx {
> + utf8string locale;
> + gssx_buffer server_ctx;
> + struct gssx_option_array options;
> +};
> +
> +struct gssx_name_attr {
> + gssx_buffer attr;
> + gssx_buffer value;
> + struct gssx_option_array extensions;
> +};
> +
> +struct gssx_name_attr_array {
> + u32 count;
> + struct gssx_name_attr *data;
> +};
> +
> +struct gssx_name {
> + gssx_buffer display_name;
> + gssx_OID name_type;
> + gssx_buffer exported_name;
> + gssx_buffer exported_composite_name;
> + struct gssx_name_attr_array name_attributes;
> + struct gssx_option_array extensions;
> +};
> +typedef struct gssx_name gssx_name;
> +
> +struct gssx_cred_element {
> + gssx_name MN;
> + gssx_OID mech;
> + u32 cred_usage;
> + u64 initiator_time_rec;
> + u64 acceptor_time_rec;
> + struct gssx_option_array options;
> +};
> +
> +struct gssx_cred_element_array {
> + u32 count;
> + struct gssx_cred_element *data;
> +};
> +
> +struct gssx_cred {
> + gssx_name desired_name;
> + struct gssx_cred_element_array elements;
> + gssx_buffer cred_handle_reference;
> + u32 needs_release;
> +};
> +
> +struct gssx_ctx {
> + gssx_buffer exported_context_token;
> + gssx_buffer state;
> + u32 need_release;
> + gssx_OID mech;
> + gssx_name src_name;
> + gssx_name targ_name;
> + u64 lifetime;
> + u64 ctx_flags;
> + u32 locally_initiated;
> + u32 open;
> + struct gssx_option_array options;
> +};
> +
> +struct gssx_cb {
> + u64 initiator_addrtype;
> + gssx_buffer initiator_address;
> + u64 acceptor_addrtype;
> + gssx_buffer acceptor_address;
> + gssx_buffer application_data;
> +};
> +
> +
> +/* This structure is not defined in the protocol.
> + * It is used in the kernel to carry around a big buffer
> + * as a set of pages */
> +struct gssp_in_token {
> + struct page **pages; /* Array of contiguous pages */
> + unsigned int page_base; /* Start of page data */
> + unsigned int page_len; /* Length of page data */
> +};
> +
> +struct gssx_arg_accept_sec_context {
> + struct gssx_call_ctx call_ctx;
> + struct gssx_ctx *context_handle;
> + struct gssx_cred *cred_handle;
> + struct gssp_in_token input_token;
> + struct gssx_cb *input_cb;
> + u32 ret_deleg_cred;
> + struct gssx_option_array options;
> +};
> +
> +struct gssx_res_accept_sec_context {
> + struct gssx_status status;
> + struct gssx_ctx *context_handle;
> + gssx_buffer *output_token;
> + struct gssx_cred *delegated_cred_handle;
> + struct gssx_option_array options;
> +};
> +
> +
> +
> +#define gssx_enc_indicate_mechs NULL
> +#define gssx_dec_indicate_mechs NULL
> +#define gssx_enc_get_call_context NULL
> +#define gssx_dec_get_call_context NULL
> +#define gssx_enc_import_and_canon_name NULL
> +#define gssx_dec_import_and_canon_name NULL
> +#define gssx_enc_export_cred NULL
> +#define gssx_dec_export_cred NULL
> +#define gssx_enc_import_cred NULL
> +#define gssx_dec_import_cred NULL
> +#define gssx_enc_acquire_cred NULL
> +#define gssx_dec_acquire_cred NULL
> +#define gssx_enc_store_cred NULL
> +#define gssx_dec_store_cred NULL
> +#define gssx_enc_init_sec_context NULL
> +#define gssx_dec_init_sec_context NULL
> +void gssx_enc_accept_sec_context(struct rpc_rqst *req,
> + struct xdr_stream *xdr,
> + struct gssx_arg_accept_sec_context *args);
> +int gssx_dec_accept_sec_context(struct rpc_rqst *rqstp,
> + struct xdr_stream *xdr,
> + struct gssx_res_accept_sec_context *res);
> +#define gssx_enc_release_handle NULL
> +#define gssx_dec_release_handle NULL
> +#define gssx_enc_get_mic NULL
> +#define gssx_dec_get_mic NULL
> +#define gssx_enc_verify NULL
> +#define gssx_dec_verify NULL
> +#define gssx_enc_wrap NULL
> +#define gssx_dec_wrap NULL
> +#define gssx_enc_unwrap NULL
> +#define gssx_dec_unwrap NULL
> +#define gssx_enc_wrap_size_limit NULL
> +#define gssx_dec_wrap_size_limit NULL
> +
> +/* non implemented calls are set to 0 size */
> +#define GSSX_ARG_indicate_mechs_sz 0
> +#define GSSX_RES_indicate_mechs_sz 0
> +#define GSSX_ARG_get_call_context_sz 0
> +#define GSSX_RES_get_call_context_sz 0
> +#define GSSX_ARG_import_and_canon_name_sz 0
> +#define GSSX_RES_import_and_canon_name_sz 0
> +#define GSSX_ARG_export_cred_sz 0
> +#define GSSX_RES_export_cred_sz 0
> +#define GSSX_ARG_import_cred_sz 0
> +#define GSSX_RES_import_cred_sz 0
> +#define GSSX_ARG_acquire_cred_sz 0
> +#define GSSX_RES_acquire_cred_sz 0
> +#define GSSX_ARG_store_cred_sz 0
> +#define GSSX_RES_store_cred_sz 0
> +#define GSSX_ARG_init_sec_context_sz 0
> +#define GSSX_RES_init_sec_context_sz 0
> +
> +#define GSSX_default_in_call_ctx_sz (4 + 4 + 4 + \
> + 8 + sizeof(LUCID_OPTION) + sizeof(LUCID_VALUE) + \
> + 8 + sizeof(CREDS_OPTION) + sizeof(CREDS_VALUE))
> +#define GSSX_default_in_ctx_hndl_sz (4 + 4+8 + 4 + 4 + 6*4 + 6*4 + 8 + 8 + \
> + 4 + 4 + 4)
> +#define GSSX_default_in_cred_sz 4 /* we send in no cred_handle */
> +#define GSSX_default_in_token_sz 4 /* does *not* include token data */
> +#define GSSX_default_in_cb_sz 4 /* we do not use channel bindings */
> +#define GSSX_ARG_accept_sec_context_sz (GSSX_default_in_call_ctx_sz + \
> + GSSX_default_in_ctx_hndl_sz + \
> + GSSX_default_in_cred_sz + \
> + GSSX_default_in_token_sz + \
> + GSSX_default_in_cb_sz + \
> + 4 /* no deleg creds boolean */ + \
> + 4) /* empty options */
> +
> +/* somewhat arbitrary numbers but large enough (we ignore some of the data
> + * sent down, but it is part of the protocol so we need enough space to take
> + * it in) */
> +#define GSSX_default_status_sz 8 + 24 + 8 + 256 + 256 + 16 + 4
> +#define GSSX_max_output_handle_sz 128
> +#define GSSX_max_oid_sz 16
> +#define GSSX_max_princ_sz 256
> +#define GSSX_default_ctx_sz (GSSX_max_output_handle_sz + \
> + 16 + 4 + GSSX_max_oid_sz + \
> + 2 * GSSX_max_princ_sz + \
> + 8 + 8 + 4 + 4 + 4)
> +#define GSSX_max_output_token_sz 1024
> +#define GSSX_max_creds_sz (4 + 4 + 4 + NGROUPS_MAX * 4)
> +#define GSSX_RES_accept_sec_context_sz (GSSX_default_status_sz + \
> + GSSX_default_ctx_sz + \
> + GSSX_max_output_token_sz + \
> + 4 + GSSX_max_creds_sz)
> +
> +#define GSSX_ARG_release_handle_sz 0
> +#define GSSX_RES_release_handle_sz 0
> +#define GSSX_ARG_get_mic_sz 0
> +#define GSSX_RES_get_mic_sz 0
> +#define GSSX_ARG_verify_sz 0
> +#define GSSX_RES_verify_sz 0
> +#define GSSX_ARG_wrap_sz 0
> +#define GSSX_RES_wrap_sz 0
> +#define GSSX_ARG_unwrap_sz 0
> +#define GSSX_RES_unwrap_sz 0
> +#define GSSX_ARG_wrap_size_limit_sz 0
> +#define GSSX_RES_wrap_size_limit_sz 0
> +
> +
> +
> +#endif /* _LINUX_GSS_RPC_XDR_H */
--
Trond Myklebust
Linux NFS client maintainer
NetApp
Trond.Myklebust@netapp.com
www.netapp.com
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/6] SUNRPC: make AF_LOCAL connect synchronous
2013-02-21 18:17 ` Myklebust, Trond
@ 2013-02-21 19:48 ` J. Bruce Fields
2013-02-21 20:02 ` Myklebust, Trond
0 siblings, 1 reply; 21+ messages in thread
From: J. Bruce Fields @ 2013-02-21 19:48 UTC (permalink / raw)
To: Myklebust, Trond; +Cc: linux-nfs, chuck.lever, simo
On Thu, Feb 21, 2013 at 06:17:47PM +0000, Myklebust, Trond wrote:
> On Thu, 2013-02-21 at 11:38 -0500, J. Bruce Fields wrote:
> > From: "J. Bruce Fields" <bfields@redhat.com>
> >
> > It doesn't appear that anyone actually needs to connect asynchronously.
> >
> > Also, using a workqueue for the connect means we lose the namespace
> > information from the original process. This is a problem since there's
> > no way to explicitly pass in a filesystem namespace for resolution of an
> > AF_LOCAL address.
> >
> > Signed-off-by: J. Bruce Fields <bfields@redhat.com>
> > ---
> > net/sunrpc/xprtsock.c | 35 +++++++++++++++++++++++++++--------
> > 1 file changed, 27 insertions(+), 8 deletions(-)
> >
> > diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
> > index bbc0915..b1df874 100644
> > --- a/net/sunrpc/xprtsock.c
> > +++ b/net/sunrpc/xprtsock.c
> > @@ -1866,13 +1866,9 @@ static int xs_local_finish_connecting(struct rpc_xprt *xprt,
> > * @xprt: RPC transport to connect
> > * @transport: socket transport to connect
> > * @create_sock: function to create a socket of the correct type
> > - *
> > - * Invoked by a work queue tasklet.
> > */
> > -static void xs_local_setup_socket(struct work_struct *work)
> > +static void xs_local_setup_socket(struct sock_xprt *transport)
> > {
> > - struct sock_xprt *transport =
> > - container_of(work, struct sock_xprt, connect_worker.work);
> > struct rpc_xprt *xprt = &transport->xprt;
> > struct socket *sock;
> > int status = -EIO;
> > @@ -1919,6 +1915,31 @@ out:
> > current->flags &= ~PF_FSTRANS;
> > }
> >
> > +static void xs_local_connect(struct rpc_task *task)
> > +{
> > + struct rpc_xprt *xprt = task->tk_xprt;
> > + struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);
> > + unsigned long timeout;
> > +
> > + if (RPC_IS_ASYNC(task))
> > + rpc_exit(task, -ENOTCONN);
>
> Needs a "return"...
Fixed, thanks.
>
>
> > +
> > + if (transport->sock != NULL && !RPC_IS_SOFTCONN(task)) {
> > + dprintk("RPC: xs_connect delayed xprt %p for %lu "
> > + "seconds\n",
> > + xprt, xprt->reestablish_timeout / HZ);
> > + timeout = xprt->reestablish_timeout;
> > + xprt->reestablish_timeout <<= 1;
> > + if (xprt->reestablish_timeout < XS_TCP_INIT_REEST_TO)
> > + xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO;
> > + if (xprt->reestablish_timeout > XS_TCP_MAX_REEST_TO)
> > + xprt->reestablish_timeout = XS_TCP_MAX_REEST_TO;
> > + rpc_delay(task, timeout);
>
> This too needs to exit in order to sleep.
Oops, so maybe simplest would be just to connect first and then delay if
there's a failure.
(Or is there any problem just making that rpc_delay() an msleep() since
we know we're in the synchronous case?)
--b.
>
> > + } else
> > + dprintk("RPC: xs_connect scheduled xprt %p\n", xprt);
> > + xs_local_setup_socket(transport);
> > +}
> > +
> > #ifdef CONFIG_SUNRPC_SWAP
> > static void xs_set_memalloc(struct rpc_xprt *xprt)
> > {
> > @@ -2454,7 +2475,7 @@ static struct rpc_xprt_ops xs_local_ops = {
> > .alloc_slot = xprt_alloc_slot,
> > .rpcbind = xs_local_rpcbind,
> > .set_port = xs_local_set_port,
> > - .connect = xs_connect,
> > + .connect = xs_local_connect,
> > .buf_alloc = rpc_malloc,
> > .buf_free = rpc_free,
> > .send_request = xs_local_send_request,
> > @@ -2627,8 +2648,6 @@ static struct rpc_xprt *xs_setup_local(struct xprt_create *args)
> > goto out_err;
> > }
> > xprt_set_bound(xprt);
> > - INIT_DELAYED_WORK(&transport->connect_worker,
> > - xs_local_setup_socket);
> > xs_format_peer_addresses(xprt, "local", RPCBIND_NETID_LOCAL);
> > break;
> > default:
>
> --
> Trond Myklebust
> Linux NFS client maintainer
>
> NetApp
> Trond.Myklebust@netapp.com
> www.netapp.com
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 5/6] SUNRPC: Add RPC based upcall mechanism for RPCGSS auth
2013-02-21 18:35 ` Myklebust, Trond
@ 2013-02-21 19:58 ` J. Bruce Fields
2013-02-21 21:37 ` J. Bruce Fields
2013-04-12 18:11 ` J. Bruce Fields
2 siblings, 0 replies; 21+ messages in thread
From: J. Bruce Fields @ 2013-02-21 19:58 UTC (permalink / raw)
To: Myklebust, Trond; +Cc: linux-nfs, chuck.lever, simo
On Thu, Feb 21, 2013 at 06:35:46PM +0000, Myklebust, Trond wrote:
> On Thu, 2013-02-21 at 11:38 -0500, J. Bruce Fields wrote:
> > From: Simo Sorce <simo@redhat.com>
> >
> > This patch implements a sunrpc client to use the services of the gssproxy
> > userspace daemon.
> >
> > In particular it allows to perform calls in user space using an RPC
> > call instead of custom hand-coded upcall/downcall messages.
> >
> > Currently only accept_sec_context is implemented as that is all is needed for
> > the server case.
> >
> > File server modules like NFS and CIFS can use full gssapi services this way,
> > once init_sec_context is also implemented.
> >
> > For the NFS server case this code allow to lift the limit of max 2k krb5
> > tickets. This limit is prevents legitimate kerberos deployments from using krb5
> > authentication with the Linux NFS server as they have normally ticket that are
> > many kilobytes large.
> >
> > It will also allow to lift the limitation on the size of the credential set
> > (uid,gid,gids) passed down from user space for users that have very many groups
> > associated. Currently the downcall mechanism used by rpc.svcgssd is limited
> > to around 2k secondary groups of the 65k allowed by kernel structures.
> >
> > Signed-off-by: Simo Sorce <simo@redhat.com>
> > Signed-off-by: J. Bruce Fields <bfields@redhat.com>
> > ---
> > net/sunrpc/auth_gss/Makefile | 3 +-
> > net/sunrpc/auth_gss/gss_rpc_upcall.c | 353 +++++++++++++
> > net/sunrpc/auth_gss/gss_rpc_upcall.h | 43 ++
> > net/sunrpc/auth_gss/gss_rpc_xdr.c | 906 ++++++++++++++++++++++++++++++++++
> > net/sunrpc/auth_gss/gss_rpc_xdr.h | 269 ++++++++++
> > 5 files changed, 1573 insertions(+), 1 deletion(-)
> > create mode 100644 net/sunrpc/auth_gss/gss_rpc_upcall.c
> > create mode 100644 net/sunrpc/auth_gss/gss_rpc_upcall.h
> > create mode 100644 net/sunrpc/auth_gss/gss_rpc_xdr.c
> > create mode 100644 net/sunrpc/auth_gss/gss_rpc_xdr.h
> >
> > diff --git a/net/sunrpc/auth_gss/Makefile b/net/sunrpc/auth_gss/Makefile
> > index 9e4cb59..14e9e53 100644
> > --- a/net/sunrpc/auth_gss/Makefile
> > +++ b/net/sunrpc/auth_gss/Makefile
> > @@ -5,7 +5,8 @@
> > obj-$(CONFIG_SUNRPC_GSS) += auth_rpcgss.o
> >
> > auth_rpcgss-y := auth_gss.o gss_generic_token.o \
> > - gss_mech_switch.o svcauth_gss.o
> > + gss_mech_switch.o svcauth_gss.o \
> > + gss_rpc_upcall.o gss_rpc_xdr.o
> >
> > obj-$(CONFIG_RPCSEC_GSS_KRB5) += rpcsec_gss_krb5.o
> >
> > diff --git a/net/sunrpc/auth_gss/gss_rpc_upcall.c b/net/sunrpc/auth_gss/gss_rpc_upcall.c
> > new file mode 100644
> > index 0000000..5fd8c91
> > --- /dev/null
> > +++ b/net/sunrpc/auth_gss/gss_rpc_upcall.c
> > @@ -0,0 +1,353 @@
> > +/*
> > + * linux/net/sunrpc/gss_rpc_upcall.c
> > + *
> > + * Copyright (C) 2012 Simo Sorce <simo@redhat.com>
> > + *
> > + * This program is free software; you can redistribute it and/or modify
> > + * it under the terms of the GNU General Public License as published by
> > + * the Free Software Foundation; either version 2 of the License, or
> > + * (at your option) any later version.
> > + *
> > + * This program is distributed in the hope that it will be useful,
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> > + * GNU General Public License for more details.
> > + *
> > + * You should have received a copy of the GNU General Public License
> > + * along with this program; if not, write to the Free Software
> > + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> > + */
> > +
> > +#include <linux/types.h>
> > +#include <linux/un.h>
> > +
> > +#include <linux/sunrpc/svcauth.h>
> > +#include "gss_rpc_upcall.h"
> > +
> > +#define GSSPROXY_SOCK_PATHNAME "/var/run/gssproxy.sock"
> > +
> > +#define GSSPROXY_PROGRAM (400112u)
> > +#define GSSPROXY_VERS_1 (1u)
> > +
> > +DEFINE_MUTEX(gssp_clnt_mutex);
> > +struct rpc_clnt *gssp_clnt;
> > +
> > +/*
> > + * Encoding/Decoding functions
> > + */
> > +
> > +enum {
> > + GSSX_NULL = 0, /* Unused */
> > + GSSX_INDICATE_MECHS = 1,
> > + GSSX_GET_CALL_CONTEXT = 2,
> > + GSSX_IMPORT_AND_CANON_NAME = 3,
> > + GSSX_EXPORT_CRED = 4,
> > + GSSX_IMPORT_CRED = 5,
> > + GSSX_ACQUIRE_CRED = 6,
> > + GSSX_STORE_CRED = 7,
> > + GSSX_INIT_SEC_CONTEXT = 8,
> > + GSSX_ACCEPT_SEC_CONTEXT = 9,
> > + GSSX_RELEASE_HANDLE = 10,
> > + GSSX_GET_MIC = 11,
> > + GSSX_VERIFY = 12,
> > + GSSX_WRAP = 13,
> > + GSSX_UNWRAP = 14,
> > + GSSX_WRAP_SIZE_LIMIT = 15,
> > +};
> > +
> > +#define PROC(proc, name) \
> > +[GSSX_##proc] = { \
> > + .p_proc = GSSX_##proc, \
> > + .p_encode = (kxdreproc_t)gssx_enc_##name, \
> > + .p_decode = (kxdrdproc_t)gssx_dec_##name, \
> > + .p_arglen = GSSX_ARG_##name##_sz, \
> > + .p_replen = GSSX_RES_##name##_sz, \
> > + .p_statidx = GSSX_##proc, \
> > + .p_name = #proc, \
> > +}
> > +
> > +struct rpc_procinfo gssp_procedures[] = {
> > + PROC(INDICATE_MECHS, indicate_mechs),
> > + PROC(GET_CALL_CONTEXT, get_call_context),
> > + PROC(IMPORT_AND_CANON_NAME, import_and_canon_name),
> > + PROC(EXPORT_CRED, export_cred),
> > + PROC(IMPORT_CRED, import_cred),
> > + PROC(ACQUIRE_CRED, acquire_cred),
> > + PROC(STORE_CRED, store_cred),
> > + PROC(INIT_SEC_CONTEXT, init_sec_context),
> > + PROC(ACCEPT_SEC_CONTEXT, accept_sec_context),
> > + PROC(RELEASE_HANDLE, release_handle),
> > + PROC(GET_MIC, get_mic),
> > + PROC(VERIFY, verify),
> > + PROC(WRAP, wrap),
> > + PROC(UNWRAP, unwrap),
> > + PROC(WRAP_SIZE_LIMIT, wrap_size_limit),
> > +};
> > +
> > +
> > +
> > +/*
> > + * Common transport functions
> > + */
> > +
> > +static const struct rpc_program gssp_program;
> > +
> > +static int gssp_rpc_create(struct net *net, struct rpc_clnt **_clnt)
> > +{
> > + static const struct sockaddr_un gssp_localaddr = {
> > + .sun_family = AF_LOCAL,
> > + .sun_path = GSSPROXY_SOCK_PATHNAME,
> > + };
> > + struct rpc_create_args args = {
> > + .net = net,
> > + .protocol = XPRT_TRANSPORT_LOCAL,
> > + .address = (struct sockaddr *)&gssp_localaddr,
> > + .addrsize = sizeof(gssp_localaddr),
> > + .servername = "localhost",
> > + .program = &gssp_program,
> > + .version = GSSPROXY_VERS_1,
> > + .authflavor = RPC_AUTH_NULL,
> > + .flags = RPC_CLNT_CREATE_NOPING,
> > + };
> > + struct rpc_clnt *clnt;
> > + int result = 0;
> > +
> > + clnt = rpc_create(&args);
> > + if (IS_ERR(clnt)) {
> > + dprintk("RPC: failed to create AF_LOCAL gssproxy "
> > + "client (errno %ld).\n", PTR_ERR(clnt));
> > + result = -PTR_ERR(clnt);
> > + *_clnt = NULL;
> > + goto out;
> > + }
> > +
> > + dprintk("RPC: created new gssp local client (gssp_local_clnt: "
> > + "%p)\n", clnt);
> > + *_clnt = clnt;
> > +
> > +out:
> > + return result;
> > +}
> > +
> > +static struct rpc_clnt *get_clnt(struct net *net, bool global_clnt)
> > +{
> > + struct rpc_clnt *clnt;
> > + int err;
> > +
> > + mutex_lock(&gssp_clnt_mutex);
> > +
> > + if (global_clnt && gssp_clnt)
> > + return gssp_clnt;
>
> Ehem.... mutex_unlock()? Better yet, add an 'out:' label below, and
> replace all the 'return' statements with gotos...
Ugh, sorry, this was a patch-ordering problem, I fixed this then merged
the fix into a later patch instead of this one.
I'll fix that and work through your following comments, thanks!
--b.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/6] SUNRPC: make AF_LOCAL connect synchronous
2013-02-21 19:48 ` J. Bruce Fields
@ 2013-02-21 20:02 ` Myklebust, Trond
2013-02-21 20:36 ` J. Bruce Fields
0 siblings, 1 reply; 21+ messages in thread
From: Myklebust, Trond @ 2013-02-21 20:02 UTC (permalink / raw)
To: J. Bruce Fields; +Cc: linux-nfs, chuck.lever, simo
On Thu, 2013-02-21 at 14:48 -0500, J. Bruce Fields wrote:
> On Thu, Feb 21, 2013 at 06:17:47PM +0000, Myklebust, Trond wrote:
> > On Thu, 2013-02-21 at 11:38 -0500, J. Bruce Fields wrote:
> > > From: "J. Bruce Fields" <bfields@redhat.com>
> > >
> > > It doesn't appear that anyone actually needs to connect asynchronously.
> > >
> > > Also, using a workqueue for the connect means we lose the namespace
> > > information from the original process. This is a problem since there's
> > > no way to explicitly pass in a filesystem namespace for resolution of an
> > > AF_LOCAL address.
> > >
> > > Signed-off-by: J. Bruce Fields <bfields@redhat.com>
> > > ---
> > > net/sunrpc/xprtsock.c | 35 +++++++++++++++++++++++++++--------
> > > 1 file changed, 27 insertions(+), 8 deletions(-)
> > >
> > > diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
> > > index bbc0915..b1df874 100644
> > > --- a/net/sunrpc/xprtsock.c
> > > +++ b/net/sunrpc/xprtsock.c
> > > @@ -1866,13 +1866,9 @@ static int xs_local_finish_connecting(struct rpc_xprt *xprt,
> > > * @xprt: RPC transport to connect
> > > * @transport: socket transport to connect
> > > * @create_sock: function to create a socket of the correct type
> > > - *
> > > - * Invoked by a work queue tasklet.
> > > */
> > > -static void xs_local_setup_socket(struct work_struct *work)
> > > +static void xs_local_setup_socket(struct sock_xprt *transport)
> > > {
> > > - struct sock_xprt *transport =
> > > - container_of(work, struct sock_xprt, connect_worker.work);
> > > struct rpc_xprt *xprt = &transport->xprt;
> > > struct socket *sock;
> > > int status = -EIO;
> > > @@ -1919,6 +1915,31 @@ out:
> > > current->flags &= ~PF_FSTRANS;
> > > }
> > >
> > > +static void xs_local_connect(struct rpc_task *task)
> > > +{
> > > + struct rpc_xprt *xprt = task->tk_xprt;
> > > + struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);
> > > + unsigned long timeout;
> > > +
> > > + if (RPC_IS_ASYNC(task))
> > > + rpc_exit(task, -ENOTCONN);
> >
> > Needs a "return"...
>
> Fixed, thanks.
>
> >
> >
> > > +
> > > + if (transport->sock != NULL && !RPC_IS_SOFTCONN(task)) {
> > > + dprintk("RPC: xs_connect delayed xprt %p for %lu "
> > > + "seconds\n",
> > > + xprt, xprt->reestablish_timeout / HZ);
> > > + timeout = xprt->reestablish_timeout;
> > > + xprt->reestablish_timeout <<= 1;
> > > + if (xprt->reestablish_timeout < XS_TCP_INIT_REEST_TO)
> > > + xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO;
> > > + if (xprt->reestablish_timeout > XS_TCP_MAX_REEST_TO)
> > > + xprt->reestablish_timeout = XS_TCP_MAX_REEST_TO;
> > > + rpc_delay(task, timeout);
> >
> > This too needs to exit in order to sleep.
>
> Oops, so maybe simplest would be just to connect first and then delay if
> there's a failure.
>
> (Or is there any problem just making that rpc_delay() an msleep() since
> we know we're in the synchronous case?)
A 5 minute msleep() is probably a bit excessive. Making it interruptible
might help, but ...
That does however raise the issue of why we need exponential back off
here? An AF_LOCAL connect call is pretty efficient.
Cheers
Trond
--
Trond Myklebust
Linux NFS client maintainer
NetApp
Trond.Myklebust@netapp.com
www.netapp.com
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/6] SUNRPC: make AF_LOCAL connect synchronous
2013-02-21 20:02 ` Myklebust, Trond
@ 2013-02-21 20:36 ` J. Bruce Fields
2013-02-21 20:42 ` Myklebust, Trond
0 siblings, 1 reply; 21+ messages in thread
From: J. Bruce Fields @ 2013-02-21 20:36 UTC (permalink / raw)
To: Myklebust, Trond; +Cc: linux-nfs, chuck.lever, simo
On Thu, Feb 21, 2013 at 08:02:30PM +0000, Myklebust, Trond wrote:
> On Thu, 2013-02-21 at 14:48 -0500, J. Bruce Fields wrote:
> > On Thu, Feb 21, 2013 at 06:17:47PM +0000, Myklebust, Trond wrote:
> > > On Thu, 2013-02-21 at 11:38 -0500, J. Bruce Fields wrote:
> > > > From: "J. Bruce Fields" <bfields@redhat.com>
> > > >
> > > > It doesn't appear that anyone actually needs to connect asynchronously.
> > > >
> > > > Also, using a workqueue for the connect means we lose the namespace
> > > > information from the original process. This is a problem since there's
> > > > no way to explicitly pass in a filesystem namespace for resolution of an
> > > > AF_LOCAL address.
> > > >
> > > > Signed-off-by: J. Bruce Fields <bfields@redhat.com>
> > > > ---
> > > > net/sunrpc/xprtsock.c | 35 +++++++++++++++++++++++++++--------
> > > > 1 file changed, 27 insertions(+), 8 deletions(-)
> > > >
> > > > diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
> > > > index bbc0915..b1df874 100644
> > > > --- a/net/sunrpc/xprtsock.c
> > > > +++ b/net/sunrpc/xprtsock.c
> > > > @@ -1866,13 +1866,9 @@ static int xs_local_finish_connecting(struct rpc_xprt *xprt,
> > > > * @xprt: RPC transport to connect
> > > > * @transport: socket transport to connect
> > > > * @create_sock: function to create a socket of the correct type
> > > > - *
> > > > - * Invoked by a work queue tasklet.
> > > > */
> > > > -static void xs_local_setup_socket(struct work_struct *work)
> > > > +static void xs_local_setup_socket(struct sock_xprt *transport)
> > > > {
> > > > - struct sock_xprt *transport =
> > > > - container_of(work, struct sock_xprt, connect_worker.work);
> > > > struct rpc_xprt *xprt = &transport->xprt;
> > > > struct socket *sock;
> > > > int status = -EIO;
> > > > @@ -1919,6 +1915,31 @@ out:
> > > > current->flags &= ~PF_FSTRANS;
> > > > }
> > > >
> > > > +static void xs_local_connect(struct rpc_task *task)
> > > > +{
> > > > + struct rpc_xprt *xprt = task->tk_xprt;
> > > > + struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);
> > > > + unsigned long timeout;
> > > > +
> > > > + if (RPC_IS_ASYNC(task))
> > > > + rpc_exit(task, -ENOTCONN);
> > >
> > > Needs a "return"...
> >
> > Fixed, thanks.
> >
> > >
> > >
> > > > +
> > > > + if (transport->sock != NULL && !RPC_IS_SOFTCONN(task)) {
> > > > + dprintk("RPC: xs_connect delayed xprt %p for %lu "
> > > > + "seconds\n",
> > > > + xprt, xprt->reestablish_timeout / HZ);
> > > > + timeout = xprt->reestablish_timeout;
> > > > + xprt->reestablish_timeout <<= 1;
> > > > + if (xprt->reestablish_timeout < XS_TCP_INIT_REEST_TO)
> > > > + xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO;
> > > > + if (xprt->reestablish_timeout > XS_TCP_MAX_REEST_TO)
> > > > + xprt->reestablish_timeout = XS_TCP_MAX_REEST_TO;
> > > > + rpc_delay(task, timeout);
> > >
> > > This too needs to exit in order to sleep.
> >
> > Oops, so maybe simplest would be just to connect first and then delay if
> > there's a failure.
> >
> > (Or is there any problem just making that rpc_delay() an msleep() since
> > we know we're in the synchronous case?)
>
> A 5 minute msleep() is probably a bit excessive. Making it interruptible
> might help, but ...
> That does however raise the issue of why we need exponential back off
> here? An AF_LOCAL connect call is pretty efficient.
And the only excuse for the connect not succeeding is, what, rpcbind
just crashed or something? In which case I think our only
responsibility is just not to spin furiously. How about just something
like
ret = xs_local_setup_socket(transport);
if (ret && !RPC_IS_SOFTCONN(task))
msleep_interruptible(1000);
return;
?
Or we could keep the same exponential timeout logic and just adjust the
min/max.
I have no strong opinions here....
--b.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/6] SUNRPC: make AF_LOCAL connect synchronous
2013-02-21 20:36 ` J. Bruce Fields
@ 2013-02-21 20:42 ` Myklebust, Trond
2013-02-26 4:06 ` [PATCH] " J. Bruce Fields
0 siblings, 1 reply; 21+ messages in thread
From: Myklebust, Trond @ 2013-02-21 20:42 UTC (permalink / raw)
To: J. Bruce Fields; +Cc: linux-nfs, chuck.lever, simo
On Thu, 2013-02-21 at 15:36 -0500, J. Bruce Fields wrote:
> On Thu, Feb 21, 2013 at 08:02:30PM +0000, Myklebust, Trond wrote:
> > On Thu, 2013-02-21 at 14:48 -0500, J. Bruce Fields wrote:
> > > On Thu, Feb 21, 2013 at 06:17:47PM +0000, Myklebust, Trond wrote:
> > > > On Thu, 2013-02-21 at 11:38 -0500, J. Bruce Fields wrote:
> > > > > From: "J. Bruce Fields" <bfields@redhat.com>
> > > > >
> > > > > It doesn't appear that anyone actually needs to connect asynchronously.
> > > > >
> > > > > Also, using a workqueue for the connect means we lose the namespace
> > > > > information from the original process. This is a problem since there's
> > > > > no way to explicitly pass in a filesystem namespace for resolution of an
> > > > > AF_LOCAL address.
> > > > >
> > > > > Signed-off-by: J. Bruce Fields <bfields@redhat.com>
> > > > > ---
> > > > > net/sunrpc/xprtsock.c | 35 +++++++++++++++++++++++++++--------
> > > > > 1 file changed, 27 insertions(+), 8 deletions(-)
> > > > >
> > > > > diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
> > > > > index bbc0915..b1df874 100644
> > > > > --- a/net/sunrpc/xprtsock.c
> > > > > +++ b/net/sunrpc/xprtsock.c
> > > > > @@ -1866,13 +1866,9 @@ static int xs_local_finish_connecting(struct rpc_xprt *xprt,
> > > > > * @xprt: RPC transport to connect
> > > > > * @transport: socket transport to connect
> > > > > * @create_sock: function to create a socket of the correct type
> > > > > - *
> > > > > - * Invoked by a work queue tasklet.
> > > > > */
> > > > > -static void xs_local_setup_socket(struct work_struct *work)
> > > > > +static void xs_local_setup_socket(struct sock_xprt *transport)
> > > > > {
> > > > > - struct sock_xprt *transport =
> > > > > - container_of(work, struct sock_xprt, connect_worker.work);
> > > > > struct rpc_xprt *xprt = &transport->xprt;
> > > > > struct socket *sock;
> > > > > int status = -EIO;
> > > > > @@ -1919,6 +1915,31 @@ out:
> > > > > current->flags &= ~PF_FSTRANS;
> > > > > }
> > > > >
> > > > > +static void xs_local_connect(struct rpc_task *task)
> > > > > +{
> > > > > + struct rpc_xprt *xprt = task->tk_xprt;
> > > > > + struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);
> > > > > + unsigned long timeout;
> > > > > +
> > > > > + if (RPC_IS_ASYNC(task))
> > > > > + rpc_exit(task, -ENOTCONN);
> > > >
> > > > Needs a "return"...
> > >
> > > Fixed, thanks.
> > >
> > > >
> > > >
> > > > > +
> > > > > + if (transport->sock != NULL && !RPC_IS_SOFTCONN(task)) {
> > > > > + dprintk("RPC: xs_connect delayed xprt %p for %lu "
> > > > > + "seconds\n",
> > > > > + xprt, xprt->reestablish_timeout / HZ);
> > > > > + timeout = xprt->reestablish_timeout;
> > > > > + xprt->reestablish_timeout <<= 1;
> > > > > + if (xprt->reestablish_timeout < XS_TCP_INIT_REEST_TO)
> > > > > + xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO;
> > > > > + if (xprt->reestablish_timeout > XS_TCP_MAX_REEST_TO)
> > > > > + xprt->reestablish_timeout = XS_TCP_MAX_REEST_TO;
> > > > > + rpc_delay(task, timeout);
> > > >
> > > > This too needs to exit in order to sleep.
> > >
> > > Oops, so maybe simplest would be just to connect first and then delay if
> > > there's a failure.
> > >
> > > (Or is there any problem just making that rpc_delay() an msleep() since
> > > we know we're in the synchronous case?)
> >
> > A 5 minute msleep() is probably a bit excessive. Making it interruptible
> > might help, but ...
> > That does however raise the issue of why we need exponential back off
> > here? An AF_LOCAL connect call is pretty efficient.
>
> And the only excuse for the connect not succeeding is, what, rpcbind
> just crashed or something? In which case I think our only
> responsibility is just not to spin furiously. How about just something
> like
>
> ret = xs_local_setup_socket(transport);
> if (ret && !RPC_IS_SOFTCONN(task))
> msleep_interruptible(1000);
> return;
This general approach works for me...
> ?
>
> Or we could keep the same exponential timeout logic and just adjust the
> min/max.
>
> I have no strong opinions here....
I'm fine with just using a fixed timeout, as long as it is not too
short. 15 seconds, perhaps?
--
Trond Myklebust
Linux NFS client maintainer
NetApp
Trond.Myklebust@netapp.com
www.netapp.com
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 6/6] SUNRPC: Use gssproxy upcall for server RPCGSS authentication.
2013-02-21 16:38 ` [PATCH 6/6] SUNRPC: Use gssproxy upcall for server RPCGSS authentication J. Bruce Fields
@ 2013-02-21 21:01 ` J. Bruce Fields
2013-02-26 13:27 ` Simo Sorce
0 siblings, 1 reply; 21+ messages in thread
From: J. Bruce Fields @ 2013-02-21 21:01 UTC (permalink / raw)
To: linux-nfs; +Cc: Trond.Myklebust, chuck.lever, simo
On Thu, Feb 21, 2013 at 11:38:25AM -0500, J. Bruce Fields wrote:
> +NFS Server New RPC Upcall Mechanism
> +-----------------------------------
> +
> +The newer upcall mechanism uses RPC over a unix socket to a daemon
> +called gss-proxy, implemented by a userspace program called Gssproxy.
> +
> +The gss_proxy RPC protocol is currently documented here:
> +
> + https://fedorahosted.org/gss-proxy/wiki/ProtocolDocumentation
By the way, Simo, that still says "The protocol is not stable yet and it
is being revised while we progress prototyping client and server code."
I'm assuming that web page is just out of date--once this is in the
kernel we're *not* making backwards-incompatible changes to the
protocol.
--b.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 5/6] SUNRPC: Add RPC based upcall mechanism for RPCGSS auth
2013-02-21 18:35 ` Myklebust, Trond
2013-02-21 19:58 ` J. Bruce Fields
@ 2013-02-21 21:37 ` J. Bruce Fields
2013-04-12 18:11 ` J. Bruce Fields
2 siblings, 0 replies; 21+ messages in thread
From: J. Bruce Fields @ 2013-02-21 21:37 UTC (permalink / raw)
To: Myklebust, Trond; +Cc: linux-nfs, chuck.lever, simo
On Thu, Feb 21, 2013 at 06:35:46PM +0000, Myklebust, Trond wrote:
> On Thu, 2013-02-21 at 11:38 -0500, J. Bruce Fields wrote:
> > +int gssp_accept_sec_context_upcall(struct net *net,
> > + struct gssp_upcall_data *data)
> > +{
> > + struct gssx_arg_accept_sec_context arg;
> > + struct gssx_res_accept_sec_context res;
> > + struct gssx_ctx ctxh;
> > + struct gssx_ctx rctxh;
> > + struct gssx_cred delegcred;
> > + struct rpc_message msg = {
> > + .rpc_proc = &gssp_procedures[GSSX_ACCEPT_SEC_CONTEXT],
> > + .rpc_argp = &arg,
> > + .rpc_resp = &res,
> > + .rpc_cred = NULL, /* FIXME ? */
> > + };
> > + struct xdr_netobj client_name = { 0 , NULL };
> > + int ret;
> > +
> > + /* fill in arg */
> > + memset(&arg, 0, sizeof(arg));
> > + if (data->in_handle.len != 0) {
> > + memset(&ctxh, 0, sizeof(ctxh));
> > + arg.context_handle = &ctxh;
> > + ctxh.state = data->in_handle;
> > + }
> > + arg.input_token = data->in_token;
> > +
> > + /* use nfs/ for targ_name ? */
> > +
> > + /* prepare res */
> > + memset(&res, 0, sizeof(res));
> > + memset(&rctxh, 0, sizeof(rctxh));
> > + res.context_handle = &rctxh;
> > +
> > + /* pass in the max length we expect for each of these
> > + * buffers but let the xdr code kmalloc them */
> > + rctxh.exported_context_token.len = GSSX_max_output_handle_sz;
> > + rctxh.mech.len = GSSX_max_oid_sz;
> > + rctxh.src_name.display_name.len = GSSX_max_princ_sz;
> > +
> > + res.output_token = &data->out_token;
> > + res.output_token->len = GSSX_max_output_token_sz;
>
>
> C99 initialisers for arg, and res would clean this up nicely... Main
> question is how much stack does all the above eat?
It's about 1k, yuch. I don't think that's going to cause problems here
in practice, but I'll see if I can trim it down, at least some of it
doesn't look like it's really used.
> > +static int gssx_dec_buffer(struct xdr_stream *xdr,
> > + gssx_buffer *buf)
> > +{
> > + u32 length;
> > + __be32 *p;
> > +
> > + p = xdr_inline_decode(xdr, 4);
> > + if (unlikely(p == NULL))
> > + return -ENOSPC;
> > +
> > + length = be32_to_cpup(p);
> > + p = xdr_inline_decode(xdr, length);
>
> combine for efficiency with the 4 byte allocation above.
I don't understand what you're asking for. If you're suggesting a
single xdr_inline_decode(xdr, 4 + length)--I don't see how we can do
that with the length not known yet.
--b.
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH] SUNRPC: make AF_LOCAL connect synchronous
2013-02-21 20:42 ` Myklebust, Trond
@ 2013-02-26 4:06 ` J. Bruce Fields
0 siblings, 0 replies; 21+ messages in thread
From: J. Bruce Fields @ 2013-02-26 4:06 UTC (permalink / raw)
To: Myklebust, Trond; +Cc: J. Bruce Fields, linux-nfs, chuck.lever, simo
From: "J. Bruce Fields" <bfields@redhat.com>
It doesn't appear that anyone actually needs to connect asynchronously.
Also, using a workqueue for the connect means we lose the namespace
information from the original process. This is a problem since there's
no way to explicitly pass in a filesystem namespace for resolution of an
AF_LOCAL address.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
---
net/sunrpc/xprtsock.c | 35 +++++++++++++++++++++++++++--------
1 file changed, 27 insertions(+), 8 deletions(-)
On Thu, Feb 21, 2013 at 08:42:14PM +0000, Myklebust, Trond wrote:
> On Thu, 2013-02-21 at 15:36 -0500, J. Bruce Fields wrote:
> > On Thu, Feb 21, 2013 at 08:02:30PM +0000, Myklebust, Trond wrote:
> > > A 5 minute msleep() is probably a bit excessive. Making it interruptible
> > > might help, but ...
> > > That does however raise the issue of why we need exponential back off
> > > here? An AF_LOCAL connect call is pretty efficient.
> >
> > And the only excuse for the connect not succeeding is, what, rpcbind
> > just crashed or something? In which case I think our only
> > responsibility is just not to spin furiously. How about just something
> > like
> >
> > ret = xs_local_setup_socket(transport);
> > if (ret && !RPC_IS_SOFTCONN(task))
> > msleep_interruptible(1000);
> > return;
>
> This general approach works for me...
>
> > ?
> >
> > Or we could keep the same exponential timeout logic and just adjust the
> > min/max.
> >
> > I have no strong opinions here....
>
> I'm fine with just using a fixed timeout, as long as it is not too
> short. 15 seconds, perhaps?
OK, just plugging in 15s--does this look OK? If so, could you take it
for 3.9?
The rest of the gss-proxy work will have to wait for 3.10, I think, but
this seems simple enough and also fills in one last gap in the nfsd
containerization work.--b.
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index bbc0915..4dc8eb2 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -1866,13 +1866,9 @@ static int xs_local_finish_connecting(struct rpc_xprt *xprt,
* @xprt: RPC transport to connect
* @transport: socket transport to connect
* @create_sock: function to create a socket of the correct type
- *
- * Invoked by a work queue tasklet.
*/
-static void xs_local_setup_socket(struct work_struct *work)
+static int xs_local_setup_socket(struct sock_xprt *transport)
{
- struct sock_xprt *transport =
- container_of(work, struct sock_xprt, connect_worker.work);
struct rpc_xprt *xprt = &transport->xprt;
struct socket *sock;
int status = -EIO;
@@ -1917,6 +1913,31 @@ out:
xprt_clear_connecting(xprt);
xprt_wake_pending_tasks(xprt, status);
current->flags &= ~PF_FSTRANS;
+ return status;
+}
+
+static void xs_local_connect(struct rpc_task *task)
+{
+ struct rpc_xprt *xprt = task->tk_xprt;
+ struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);
+ int ret;
+
+ if (RPC_IS_ASYNC(task)) {
+ /*
+ * We want the AF_LOCAL connect to be resolved in the
+ * filesystem namespace of the process making the rpc
+ * call. Thus we connect synchronously.
+ *
+ * If we want to support asynchronous AF_LOCAL calls,
+ * we'll need to figure out how to pass a namespace to
+ * connect.
+ */
+ rpc_exit(task, -ENOTCONN);
+ return;
+ }
+ ret = xs_local_setup_socket(transport);
+ if (ret && !RPC_IS_SOFTCONN(task))
+ msleep_interruptible(15000);
}
#ifdef CONFIG_SUNRPC_SWAP
@@ -2454,7 +2475,7 @@ static struct rpc_xprt_ops xs_local_ops = {
.alloc_slot = xprt_alloc_slot,
.rpcbind = xs_local_rpcbind,
.set_port = xs_local_set_port,
- .connect = xs_connect,
+ .connect = xs_local_connect,
.buf_alloc = rpc_malloc,
.buf_free = rpc_free,
.send_request = xs_local_send_request,
@@ -2627,8 +2648,6 @@ static struct rpc_xprt *xs_setup_local(struct xprt_create *args)
goto out_err;
}
xprt_set_bound(xprt);
- INIT_DELAYED_WORK(&transport->connect_worker,
- xs_local_setup_socket);
xs_format_peer_addresses(xprt, "local", RPCBIND_NETID_LOCAL);
break;
default:
--
1.7.11.7
^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: [PATCH 6/6] SUNRPC: Use gssproxy upcall for server RPCGSS authentication.
2013-02-21 21:01 ` J. Bruce Fields
@ 2013-02-26 13:27 ` Simo Sorce
0 siblings, 0 replies; 21+ messages in thread
From: Simo Sorce @ 2013-02-26 13:27 UTC (permalink / raw)
To: J. Bruce Fields; +Cc: linux-nfs, Trond.Myklebust, chuck.lever
On Thu, 2013-02-21 at 16:01 -0500, J. Bruce Fields wrote:
> On Thu, Feb 21, 2013 at 11:38:25AM -0500, J. Bruce Fields wrote:
> > +NFS Server New RPC Upcall Mechanism
> > +-----------------------------------
> > +
> > +The newer upcall mechanism uses RPC over a unix socket to a daemon
> > +called gss-proxy, implemented by a userspace program called Gssproxy.
> > +
> > +The gss_proxy RPC protocol is currently documented here:
> > +
> > + https://fedorahosted.org/gss-proxy/wiki/ProtocolDocumentation
>
> By the way, Simo, that still says "The protocol is not stable yet and it
> is being revised while we progress prototyping client and server code."
>
> I'm assuming that web page is just out of date--once this is in the
> kernel we're *not* making backwards-incompatible changes to the
> protocol.
The part that is used by the kernel is already marked as unchangeable in
my mind, I will try to take some time in the next few weeks to update
the page.
Simo.
--
Simo Sorce * Red Hat, Inc * New York
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 5/6] SUNRPC: Add RPC based upcall mechanism for RPCGSS auth
2013-02-21 18:35 ` Myklebust, Trond
2013-02-21 19:58 ` J. Bruce Fields
2013-02-21 21:37 ` J. Bruce Fields
@ 2013-04-12 18:11 ` J. Bruce Fields
2013-04-12 18:21 ` Myklebust, Trond
2 siblings, 1 reply; 21+ messages in thread
From: J. Bruce Fields @ 2013-04-12 18:11 UTC (permalink / raw)
To: Myklebust, Trond; +Cc: J. Bruce Fields, linux-nfs, chuck.lever, simo
Trond, apologies, I'm just getting back to this and had a couple
questions:
On Thu, Feb 21, 2013 at 06:35:46PM +0000, Myklebust, Trond wrote:
> On Thu, 2013-02-21 at 11:38 -0500, J. Bruce Fields wrote:
> > +static int gssx_dec_buffer(struct xdr_stream *xdr,
> > + gssx_buffer *buf)
> > +{
> > + u32 length;
> > + __be32 *p;
> > +
> > + p = xdr_inline_decode(xdr, 4);
> > + if (unlikely(p == NULL))
> > + return -ENOSPC;
> > +
> > + length = be32_to_cpup(p);
> > + p = xdr_inline_decode(xdr, length);
>
> combine for efficiency with the 4 byte allocation above.
This was just a think-o on your part, right? There's no way to decode
the whole thing in one gulp without knowing the length ahead of time.
Or am I missing something?
> > +static int gssx_dec_option_array(struct xdr_stream *xdr,
> > + struct gssx_option_array *oa)
> > +{
> > + struct svc_cred *creds;
> > + u32 count, i;
> > + __be32 *p;
> > + int err;
> > +
> > + p = xdr_inline_decode(xdr, 4);
> > + if (unlikely(p == NULL))
> > + return -ENOSPC;
> > + count = be32_to_cpup(p++);
> > + if (count != 0) {
> > + /* we recognize only 1 currently: CREDS_VALUE */
> > + oa->count = 1;
> > +
> > + oa->data = kmalloc(sizeof(struct gssx_option), GFP_KERNEL);
>
> Sleeping kmallocs inside XDR encode/decode routines is strongly
> discouraged. Particularly so for something that can be preallocated.
And here: I don't mind doing that, but: there's no real problem here as
long as we're only calling this stuff synchronously, right?
--b.
^ permalink raw reply [flat|nested] 21+ messages in thread
* RE: [PATCH 5/6] SUNRPC: Add RPC based upcall mechanism for RPCGSS auth
2013-04-12 18:11 ` J. Bruce Fields
@ 2013-04-12 18:21 ` Myklebust, Trond
2013-04-12 18:33 ` J. Bruce Fields
0 siblings, 1 reply; 21+ messages in thread
From: Myklebust, Trond @ 2013-04-12 18:21 UTC (permalink / raw)
To: J. Bruce Fields; +Cc: J. Bruce Fields, linux-nfs, chuck.lever, simo
> -----Original Message-----
> From: J. Bruce Fields [mailto:bfields@fieldses.org]
> Sent: Friday, April 12, 2013 2:12 PM
> To: Myklebust, Trond
> Cc: J. Bruce Fields; linux-nfs@vger.kernel.org; chuck.lever@oracle.com;
> simo@redhat.com
> Subject: Re: [PATCH 5/6] SUNRPC: Add RPC based upcall mechanism for
> RPCGSS auth
>
> Trond, apologies, I'm just getting back to this and had a couple
> questions:
>
> On Thu, Feb 21, 2013 at 06:35:46PM +0000, Myklebust, Trond wrote:
> > On Thu, 2013-02-21 at 11:38 -0500, J. Bruce Fields wrote:
> > > +static int gssx_dec_buffer(struct xdr_stream *xdr,
> > > + gssx_buffer *buf)
> > > +{
> > > + u32 length;
> > > + __be32 *p;
> > > +
> > > + p = xdr_inline_decode(xdr, 4);
> > > + if (unlikely(p == NULL))
> > > + return -ENOSPC;
> > > +
> > > + length = be32_to_cpup(p);
> > > + p = xdr_inline_decode(xdr, length);
> >
> > combine for efficiency with the 4 byte allocation above.
>
> This was just a think-o on your part, right? There's no way to decode the
> whole thing in one gulp without knowing the length ahead of time.
> Or am I missing something?
No. You are right, that was a brain-fart...
> > > +static int gssx_dec_option_array(struct xdr_stream *xdr,
> > > + struct gssx_option_array *oa)
> > > +{
> > > + struct svc_cred *creds;
> > > + u32 count, i;
> > > + __be32 *p;
> > > + int err;
> > > +
> > > + p = xdr_inline_decode(xdr, 4);
> > > + if (unlikely(p == NULL))
> > > + return -ENOSPC;
> > > + count = be32_to_cpup(p++);
> > > + if (count != 0) {
> > > + /* we recognize only 1 currently: CREDS_VALUE */
> > > + oa->count = 1;
> > > +
> > > + oa->data = kmalloc(sizeof(struct gssx_option), GFP_KERNEL);
> >
> > Sleeping kmallocs inside XDR encode/decode routines is strongly
> > discouraged. Particularly so for something that can be preallocated.
>
> And here: I don't mind doing that, but: there's no real problem here as long
> as we're only calling this stuff synchronously, right?
If you can guarantee that it won't ever be called from rpciod, then fine.
However anything that might end up being called from a rpciod context must at the very least guarantee that there are no __GFP_FS allocations, since those can deadlock the NFS client.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 5/6] SUNRPC: Add RPC based upcall mechanism for RPCGSS auth
2013-04-12 18:21 ` Myklebust, Trond
@ 2013-04-12 18:33 ` J. Bruce Fields
0 siblings, 0 replies; 21+ messages in thread
From: J. Bruce Fields @ 2013-04-12 18:33 UTC (permalink / raw)
To: Myklebust, Trond; +Cc: J. Bruce Fields, linux-nfs, chuck.lever, simo
On Fri, Apr 12, 2013 at 06:21:11PM +0000, Myklebust, Trond wrote:
> > -----Original Message-----
> > From: J. Bruce Fields [mailto:bfields@fieldses.org]
> > Sent: Friday, April 12, 2013 2:12 PM
> > To: Myklebust, Trond
> > Cc: J. Bruce Fields; linux-nfs@vger.kernel.org; chuck.lever@oracle.com;
> > simo@redhat.com
> > Subject: Re: [PATCH 5/6] SUNRPC: Add RPC based upcall mechanism for
> > RPCGSS auth
> >
> > Trond, apologies, I'm just getting back to this and had a couple
> > questions:
> >
> > On Thu, Feb 21, 2013 at 06:35:46PM +0000, Myklebust, Trond wrote:
> > > On Thu, 2013-02-21 at 11:38 -0500, J. Bruce Fields wrote:
> > > > +static int gssx_dec_buffer(struct xdr_stream *xdr,
> > > > + gssx_buffer *buf)
> > > > +{
> > > > + u32 length;
> > > > + __be32 *p;
> > > > +
> > > > + p = xdr_inline_decode(xdr, 4);
> > > > + if (unlikely(p == NULL))
> > > > + return -ENOSPC;
> > > > +
> > > > + length = be32_to_cpup(p);
> > > > + p = xdr_inline_decode(xdr, length);
> > >
> > > combine for efficiency with the 4 byte allocation above.
> >
> > This was just a think-o on your part, right? There's no way to decode the
> > whole thing in one gulp without knowing the length ahead of time.
> > Or am I missing something?
>
> No. You are right, that was a brain-fart...
>
> > > > +static int gssx_dec_option_array(struct xdr_stream *xdr,
> > > > + struct gssx_option_array *oa)
> > > > +{
> > > > + struct svc_cred *creds;
> > > > + u32 count, i;
> > > > + __be32 *p;
> > > > + int err;
> > > > +
> > > > + p = xdr_inline_decode(xdr, 4);
> > > > + if (unlikely(p == NULL))
> > > > + return -ENOSPC;
> > > > + count = be32_to_cpup(p++);
> > > > + if (count != 0) {
> > > > + /* we recognize only 1 currently: CREDS_VALUE */
> > > > + oa->count = 1;
> > > > +
> > > > + oa->data = kmalloc(sizeof(struct gssx_option), GFP_KERNEL);
> > >
> > > Sleeping kmallocs inside XDR encode/decode routines is strongly
> > > discouraged. Particularly so for something that can be preallocated.
> >
> > And here: I don't mind doing that, but: there's no real problem here as long
> > as we're only calling this stuff synchronously, right?
>
> If you can guarantee that it won't ever be called from rpciod, then fine.
> However anything that might end up being called from a rpciod context must at the very least guarantee that there are no __GFP_FS allocations, since those can deadlock the NFS client.
Got it, thanks
--b.
^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2013-04-12 18:33 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-02-21 16:38 [PATCH 0/6] gss-proxy upcall for nfsd J. Bruce Fields
2013-02-21 16:38 ` [PATCH 1/6] SUNRPC: make AF_LOCAL connect synchronous J. Bruce Fields
2013-02-21 18:17 ` Myklebust, Trond
2013-02-21 19:48 ` J. Bruce Fields
2013-02-21 20:02 ` Myklebust, Trond
2013-02-21 20:36 ` J. Bruce Fields
2013-02-21 20:42 ` Myklebust, Trond
2013-02-26 4:06 ` [PATCH] " J. Bruce Fields
2013-02-21 16:38 ` [PATCH 2/6] SUNRPC: attempt AF_LOCAL connect on setup J. Bruce Fields
2013-02-21 16:38 ` [PATCH 3/6] SUNRPC: no idle timeout for AF_LOCAL sockets J. Bruce Fields
2013-02-21 16:38 ` [PATCH 4/6] SUNRPC: conditionally return endtime from import_sec_context J. Bruce Fields
2013-02-21 16:38 ` [PATCH 5/6] SUNRPC: Add RPC based upcall mechanism for RPCGSS auth J. Bruce Fields
2013-02-21 18:35 ` Myklebust, Trond
2013-02-21 19:58 ` J. Bruce Fields
2013-02-21 21:37 ` J. Bruce Fields
2013-04-12 18:11 ` J. Bruce Fields
2013-04-12 18:21 ` Myklebust, Trond
2013-04-12 18:33 ` J. Bruce Fields
2013-02-21 16:38 ` [PATCH 6/6] SUNRPC: Use gssproxy upcall for server RPCGSS authentication J. Bruce Fields
2013-02-21 21:01 ` J. Bruce Fields
2013-02-26 13:27 ` Simo Sorce
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.