Return-Path: Received: from mx142.netapp.com ([216.240.21.19]:52446 "EHLO mx142.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752647AbdG1UWd (ORCPT ); Fri, 28 Jul 2017 16:22:33 -0400 From: To: CC: , , , , Andy Adamson Subject: [PATCH Version 6 11/12] SUNRPC SVCAUTH_GSS set gss3 label on nfsd thread Date: Fri, 28 Jul 2017 16:21:57 -0400 Message-ID: <1501273318-14200-12-git-send-email-andros@netapp.com> In-Reply-To: <1501273318-14200-1-git-send-email-andros@netapp.com> References: <1501273318-14200-1-git-send-email-andros@netapp.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-nfs-owner@vger.kernel.org List-ID: From: Andy Adamson Note: may need to give nfsd selinux authority to change thread label. Signed-off-by: Andy Adamson --- fs/nfsd/auth.c | 11 ++++++++++- include/linux/sunrpc/svcauth.h | 1 + net/sunrpc/auth_gss/svcauth_gss.c | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/fs/nfsd/auth.c b/fs/nfsd/auth.c index 62469c6..0330fe9 100644 --- a/fs/nfsd/auth.c +++ b/fs/nfsd/auth.c @@ -1,6 +1,7 @@ /* Copyright (C) 1995, 1996 Olaf Kirch */ #include +#include #include "nfsd.h" #include "auth.h" @@ -22,7 +23,7 @@ int nfsd_setuser(struct svc_rqst *rqstp, struct svc_export *exp) struct group_info *rqgi; struct group_info *gi; struct cred *new; - int i; + int i, ret; int flags = nfsexp_flags(rqstp, exp); validate_process_creds(); @@ -77,6 +78,14 @@ int nfsd_setuser(struct svc_rqst *rqstp, struct svc_export *exp) else new->cap_effective = cap_raise_nfsd_set(new->cap_effective, new->cap_permitted); + + if (selinux_is_enabled() && rqstp->rq_authop->set_label && + (exp->ex_flags & NFSEXP_SECURITY_LABEL)) { + ret = rqstp->rq_authop->set_label(rqstp, new); + if (ret < 0) + /* Should nfsd fail this request? */ + pr_warn("%s set_label FAILED ret %d\n", __func__, ret); + } validate_process_creds(); put_cred(override_creds(new)); put_cred(new); diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h index d039320..eed6880 100644 --- a/include/linux/sunrpc/svcauth.h +++ b/include/linux/sunrpc/svcauth.h @@ -128,6 +128,7 @@ struct auth_ops { int (*release)(struct svc_rqst *rq); void (*domain_release)(struct auth_domain *); int (*set_client)(struct svc_rqst *rq); + int (*set_label)(struct svc_rqst *rq, struct cred *new); }; #define SVC_GARBAGE 1 diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c index 1b6e47f..2a48aa0 100644 --- a/net/sunrpc/auth_gss/svcauth_gss.c +++ b/net/sunrpc/auth_gss/svcauth_gss.c @@ -1072,6 +1072,37 @@ struct gss_svc_data { return SVC_OK; } +/** + * the svcdata->rsci_ch pointer is the child context. + * assume one GSS3_LABEL per child context. + */ +static int +svcauth_gss_set_label(struct svc_rqst *rqstp, struct cred *new) +{ + struct gss_svc_data *svcdata = rqstp->rq_auth_data; + struct rsc *rsci_ch = svcdata->rsci_ch; + struct gss3_svc_assert *g3a; + struct gss3_label *g3l; + int ret = -1; + + if (!rsci_ch || !rsci_ch->assertions) + goto out; + + g3a = rsci_ch->assertions; + if (g3a->sa_num != 1 || g3a->sa_assert.au_type != GSS3_LABEL) + goto out; + + g3l = &g3a->sa_assert.u.au_label; + if (g3l->la_label.len == 0) + goto out; + + /* Assume SeLinux - need to validate la_lfs and la_pi ? */ + ret = set_security_override_from_ctx(new, (char *)g3l->la_label.data); + +out: + return ret; +} + static inline int gss_write_init_verf(struct cache_detail *cd, struct svc_rqst *rqstp, struct rpc_gss_wire_cred *gc, @@ -2126,6 +2157,7 @@ static void gss3_free_svc_assert(struct gss3_svc_assert *g3a) .release = svcauth_gss_release, .domain_release = svcauth_gss_domain_release, .set_client = svcauth_gss_set_client, + .set_label = svcauth_gss_set_label, }; static int rsi_cache_create_net(struct net *net) -- 1.8.3.1