From patchwork Tue Dec 24 23:59:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Casey Schaufler X-Patchwork-Id: 11309847 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D834D184C for ; Wed, 25 Dec 2019 00:02:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B506F2071A for ; Wed, 25 Dec 2019 00:02:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=yahoo.com header.i=@yahoo.com header.b="PFtMtmKZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726258AbfLYACX (ORCPT ); Tue, 24 Dec 2019 19:02:23 -0500 Received: from sonic306-28.consmr.mail.ne1.yahoo.com ([66.163.189.90]:34585 "EHLO sonic306-28.consmr.mail.ne1.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726246AbfLYACW (ORCPT ); Tue, 24 Dec 2019 19:02:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1577232141; bh=B7f3bVSqLF7gFNwR8cc+puxEW5CR+QDjbHGaiVfLA/4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Subject; b=PFtMtmKZ2pyjgFJ3+Zkus7EPCtQsemIOkqQfLkUORTYu4DyqFf+av57+CUKXPRpmSzr3FRdCsVF8Oq2UOCBH2DFpRg9w30w6PXQcEEaHGHmBewh8zc+5OA7O28LAw8G7d9pmJp+eYSJVBP9pB1CwA2Xa8nxL9Wd116GUnp8sbsiVKMW4j9/GGs4oV+LuEtYBOk8GQhO7kbzrOkDPfTUaDqjYSPnjR9d8il3MVG13cLZsOUY0CDWHUcWfJwmlR/3Zu2fOoUWCMrb5blV3umlGP0jvSWGixHjCBLqFTxqbhad5vO+mTBRx1TL6cC3qIqxDUcykIm6U8bN9HYH96SK2TA== X-YMail-OSG: QflPmIkVM1mjoktseDkX3.EEam_5sagqhpAMpRko251NAxnnBme6pRimiabQYYM cK0UwEEIhVciq2uEn7IyddFntI_LlFBr.nA1Y_cT9QnCTN8GNEpJJLOglh9.EXGUn0v8L2GC7z7I Pra6VpRZ45.qhJTppQlyARZ4he5POxBJZWYxkKu29L_Ost.ok6IpI8l4pVXfcH4YreCkUVsLGf6U TIxm6c6FflCgoq2XK6_n5NPomMNu4i4Zsd6uaF0Nw09xuCXmGuCYuTU5_UjBY60I8pPbDKPMc.qv LLMHJDPDGD61V3TDbG4bAaysfxWd5AlekzaUd.KgLzU52FKx2TnT8hLBjE3w4eNyjpAlTsSeB45b aCoDmfvv.dggaqmmxvk2FDpaKVfXDbxn9izH4_Ralng0Av.PWhQwmSGnMeh7v2pfwQY5wLE9SEfs ZgHkKo448EJvFMOLFPtTyAyVvyT73auKFfnRiD3e_RY3D6NlJiTYnxBL3NFS3jAZMt6wQRy_xskz 2O2hrXbrxysAkXR7F0_EomYGtTX62.HaEdvN65Yp9IevWyl9KVlxmi0G3tf7GnqxZQPgP5bIvYkW Z_S2pgBxVfnICnpsDLCjhckQz7m6ccW.5kpeoE6ye2xdDRuPY_8NBy.P1UrsqKPPsayhWuvtIy21 pUNEx1p2aBcyySVfJXYuUJ_M6fErRY40ncIILsBObUmZYCTy02YE1GYaa4Mt0k0wSWA1mgggGnn8 rrUaNtmd3OZcFjC07L2OtyDQMAZZ3PZ8AXcR1bzmxKQfxqfgNKCLU67biaJn.v_bVM4QT.NZOn8d G.E.PziGj4cdVfkopIPei4dMRZZz7tx3zNDp_vAX1DySBX2gd6_Sarj10Be8TNppkLFPOsfGLZ8l 5Cf4XxkQK7BlcpcY6D84VJzzrKyBpR0xfiETfpHVpbjpGYjYatr_Tx1._iKcuIOVCaDPfUhWJRz3 OwveWzh6UsoM2gK.wsIshMhqJl7SkdQBtCI4LWFRpK.Bg_o0mcALOg2woTTHtVvi1acCslhuJTv4 YcgQypeG3uFTC8bAMdszjxAv8V0XobyEv0y9RgjHJZ9da6D8ygRTuzLi.pkkDQcrboUrvwgFCepE 6mACEYI4OizMfI_K8h9MDTptEM2MFkOzrvR0lSNYGvFnF0Rohs6cH5Sn6nieGfNwYMATDz1xB3jF _OdLUyyrhOJJeynWwVUMvEroiv8Y9p6wll4HKhSl5E_pC70h3m2Fk2Bro5A2iCk_S6NbIx8eEf_m 4zOq0v.s4NbHM30J.f64wlC8UWjbu6bqB363AoKmizVCF.HmF9rYIL1OmQ1aTtHRH_COTDIlOEg9 R9sAge4P7M1yZ5vzBltUD2fjdjnTsV4a_Nzv2lY49mWuLbjGuRXeBpyX6kRPjCOHEd6oIgnTmiWN GG40jkMYcfiaTu0oUKZFOhctLleL4KiyXFKq8OG1_rRZAxYrLMUA179g- Received: from sonic.gate.mail.ne1.yahoo.com by sonic306.consmr.mail.ne1.yahoo.com with HTTP; Wed, 25 Dec 2019 00:02:21 +0000 Received: by smtp406.mail.gq1.yahoo.com (Oath Hermes SMTP Server) with ESMTPA ID 999b3ab1903a52a38605bbd14be4cac7; Wed, 25 Dec 2019 00:02:18 +0000 (UTC) From: Casey Schaufler To: casey.schaufler@intel.com, jmorris@namei.org, linux-security-module@vger.kernel.org, selinux@vger.kernel.org Cc: casey@schaufler-ca.com, keescook@chromium.org, john.johansen@canonical.com, penguin-kernel@i-love.sakura.ne.jp, paul@paul-moore.com, sds@tycho.nsa.gov Subject: [PATCH v13 17/25] LSM: Use lsmcontext in security_inode_getsecctx Date: Tue, 24 Dec 2019 15:59:31 -0800 Message-Id: <20191224235939.7483-18-casey@schaufler-ca.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191224235939.7483-1-casey@schaufler-ca.com> References: <20191224235939.7483-1-casey@schaufler-ca.com> MIME-Version: 1.0 Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: Change the security_inode_getsecctx() interface to fill a lsmcontext structure instead of data and length pointers. This provides the information about which LSM created the context so that security_release_secctx() can use the correct hook. Acked-by: Stephen Smalley Signed-off-by: Casey Schaufler --- fs/nfsd/nfs4xdr.c | 23 +++++++++-------------- include/linux/security.h | 5 +++-- security/security.c | 13 +++++++++++-- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index e20011281915..98d20178e60f 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -2304,11 +2304,11 @@ nfsd4_encode_layout_types(struct xdr_stream *xdr, u32 layout_types) #ifdef CONFIG_NFSD_V4_SECURITY_LABEL static inline __be32 nfsd4_encode_security_label(struct xdr_stream *xdr, struct svc_rqst *rqstp, - void *context, int len) + struct lsmcontext *context) { __be32 *p; - p = xdr_reserve_space(xdr, len + 4 + 4 + 4); + p = xdr_reserve_space(xdr, context->len + 4 + 4 + 4); if (!p) return nfserr_resource; @@ -2318,13 +2318,13 @@ nfsd4_encode_security_label(struct xdr_stream *xdr, struct svc_rqst *rqstp, */ *p++ = cpu_to_be32(0); /* lfs */ *p++ = cpu_to_be32(0); /* pi */ - p = xdr_encode_opaque(p, context, len); + p = xdr_encode_opaque(p, context->context, context->len); return 0; } #else static inline __be32 nfsd4_encode_security_label(struct xdr_stream *xdr, struct svc_rqst *rqstp, - void *context, int len) + struct lsmcontext *context) { return 0; } #endif @@ -2421,9 +2421,7 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp, int err; struct nfs4_acl *acl = NULL; #ifdef CONFIG_NFSD_V4_SECURITY_LABEL - struct lsmcontext scaff; /* scaffolding */ - void *context = NULL; - int contextlen; + struct lsmcontext context = { }; #endif bool contextsupport = false; struct nfsd4_compoundres *resp = rqstp->rq_resp; @@ -2481,7 +2479,7 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp, bmval0 & FATTR4_WORD0_SUPPORTED_ATTRS) { if (exp->ex_flags & NFSEXP_SECURITY_LABEL) err = security_inode_getsecctx(d_inode(dentry), - &context, &contextlen); + &context); else err = -EOPNOTSUPP; contextsupport = (err == 0); @@ -2911,8 +2909,7 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp, #ifdef CONFIG_NFSD_V4_SECURITY_LABEL if (bmval2 & FATTR4_WORD2_SECURITY_LABEL) { - status = nfsd4_encode_security_label(xdr, rqstp, context, - contextlen); + status = nfsd4_encode_security_label(xdr, rqstp, &context); if (status) goto out; } @@ -2924,10 +2921,8 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp, out: #ifdef CONFIG_NFSD_V4_SECURITY_LABEL - if (context) { - lsmcontext_init(&scaff, context, contextlen, 0); /*scaffolding*/ - security_release_secctx(&scaff); - } + if (context.context) + security_release_secctx(&context); #endif /* CONFIG_NFSD_V4_SECURITY_LABEL */ kfree(acl); if (tempfh) { diff --git a/include/linux/security.h b/include/linux/security.h index ea98dff5ec03..49d2a778020e 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -533,7 +533,7 @@ void security_release_secctx(struct lsmcontext *cp); void security_inode_invalidate_secctx(struct inode *inode); int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen); int security_inode_setsecctx(struct dentry *dentry, void *ctx, u32 ctxlen); -int security_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen); +int security_inode_getsecctx(struct inode *inode, struct lsmcontext *cp); int security_locked_down(enum lockdown_reason what); #else /* CONFIG_SECURITY */ @@ -1358,7 +1358,8 @@ static inline int security_inode_setsecctx(struct dentry *dentry, void *ctx, u32 { return -EOPNOTSUPP; } -static inline int security_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen) +static inline int security_inode_getsecctx(struct inode *inode, + struct lsmcontext *cp) { return -EOPNOTSUPP; } diff --git a/security/security.c b/security/security.c index 29f070aa172c..affd53f04805 100644 --- a/security/security.c +++ b/security/security.c @@ -2201,9 +2201,18 @@ int security_inode_setsecctx(struct dentry *dentry, void *ctx, u32 ctxlen) } EXPORT_SYMBOL(security_inode_setsecctx); -int security_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen) +int security_inode_getsecctx(struct inode *inode, struct lsmcontext *cp) { - return call_int_hook(inode_getsecctx, -EOPNOTSUPP, inode, ctx, ctxlen); + struct security_hook_list *hp; + + memset(cp, 0, sizeof(*cp)); + + hlist_for_each_entry(hp, &security_hook_heads.inode_getsecctx, list) { + cp->slot = hp->lsmid->slot; + return hp->hook.inode_getsecctx(inode, (void **)&cp->context, + &cp->len); + } + return -EOPNOTSUPP; } EXPORT_SYMBOL(security_inode_getsecctx);