From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3EFCAC48BD1 for ; Fri, 11 Jun 2021 00:23:52 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C547A61222 for ; Fri, 11 Jun 2021 00:23:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C547A61222 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=schaufler-ca.com Authentication-Results: mail.kernel.org; spf=tempfail smtp.mailfrom=linux-audit-bounces@redhat.com Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-465-q0rRTq6uN8-ia0p4h9erIg-1; Thu, 10 Jun 2021 20:23:49 -0400 X-MC-Unique: q0rRTq6uN8-ia0p4h9erIg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4247D1084F41; Fri, 11 Jun 2021 00:23:46 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F2FB86091A; Fri, 11 Jun 2021 00:23:45 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id BD8271832DAD; Fri, 11 Jun 2021 00:23:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15B0Nh3c027258 for ; Thu, 10 Jun 2021 20:23:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id A8FA510547DC; Fri, 11 Jun 2021 00:23:43 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A494D1054E32 for ; Fri, 11 Jun 2021 00:23:40 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E948B8564EE for ; Fri, 11 Jun 2021 00:23:39 +0000 (UTC) Received: from sonic314-27.consmr.mail.ne1.yahoo.com (sonic314-27.consmr.mail.ne1.yahoo.com [66.163.189.153]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-227-zfghQjRbMPiRCXF7O96RgQ-1; Thu, 10 Jun 2021 20:23:37 -0400 X-MC-Unique: zfghQjRbMPiRCXF7O96RgQ-1 X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1623371017; bh=O4ku0UD58dh8r4Yf3KZcPbwJ1Wc7Zke0PT0kT8lKcBl=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=gtX+zWNRY43/cwhqrP5hHD65kwUdndjuOP4M3CY0nlNH483madn6MIsz3o9EebDzlZ4xh3+KhhEIRF08ZXHkeLBGJ1r/E957gLR+M2jv81gN8rmZ+WNy6uHR7mcSbTfHHYjovACPGuc7qOLVUdf+vv98IPJwmQRohvl2OQ9Jw05/+nHK8OfFYysX5P+CIGA4uCQkeIgIOgOLncB4ZrLFHYkVUTdwoEiscPbwBKGqa0tn6Q6ZXEPUKkpJbvXmQEYJRvzcODblmOA/WBsfrRAoUqPQalfCHWQNdGOTHeQ9K+nlfmX3W7JwZsYeKoQCtnonebqpIVYrfa4q3DDV9knV2w== X-YMail-OSG: UoNpczYVM1mXEy3TnlCiw0FO2C36TvyAsAg.5v4F4aVzErROsAdyyqR9Lzb49Ql z5wBPM_zECHedbRiFNNH161hs_HoPYhIHn9iSDH2E5mTusMbJVlwsGBpxZp0WWr7ybkOLN2654W5 Vt7E3gvuIbnuq8aws9IiIIYzbBESL2jH6NCO3USz3Q0fyUZ6UwkgT9j5sPqIgtmFtjWRX7bFmNX0 YsZ9ZqVVoTtxNibVFTeqcHlRzJZTY_K0VVWMqCXfRNyxMOypW_YDnUV2Ir8eBUF531VB.OOjdPdo Uz1exYP7BOxyUiyZ1nB4q2Khj1.dNOCXfF1_n7HTQrEKWa43isNBLplTx6aGzZKqtIeb8H1maw5n 8ekCm4wCee_hoS7UDaUSXaS2sb89ZUKJDr4w.GFFEiKz3vawC7jz079Mf251B8nu3hpi9tnCq0m1 t0cSI1aDDruCdBko2zf89ihV2jYBCDCES8JmLjpDWkZrxEw3yTwbfD4_deUTbv7qzNqgytADK8t3 A22cALpsXKBOkLk2yqncPLRELht67bOdbLa.x04Yuw.AIU2WellqVI9c9staAaycuH8m2N9HCuTm m8YtRsv2ReeGUPffeqhuHjXcihhnOCkBxlmJ4RrHRhqzFmJn7X90y9K_2qZNLS7ITs0c_g0tLTKz DZYPXcedjICoKyMK_q7y_gbPyaj8PNqbrTB06jMIcC6kBUWzrLS512fYrhaWDdxrKBrFevO_e3MR SYjeuKhBXcuD6bvq8UX3c2RtnPUsu3dCGX.XRObhpHrOJvPq00r9.tzv6Z24LbqW2GJWbBYTkUS4 xU0Qrx1RoknPRvhjZCfIQDLe2lDMJb4X2.aRpq3daDss2xCqFOYfHdOu4TTHLobcIROYsUA8YE2i AZ.40jUVNNuGpGCeOQlIU8xbMlGaRsLPjfg18RU5a7q8iTzdfWHhKZe_RM1nx1aYZa0Ul9IwI6Yt PftM5TFV0HinFlZhthHNeS8mK_tcCnJZHrqZX3bNGwy2h7Kcuf6jL0WoEBDDTVF5wpQgmxqA7TJb ourr4oP6NcLO5sKuLlAo920bJkcfnj8RMbuNf0W6Dvi5fxLkb3Da7f8i7quhdSPByKltgWz_9KVB NsRUAIqvg.OomgxZBiNz6hVCmlOrUZMsL3l3PctDKYm9FIpT3_4pgqbXpGOowU_WDYF0l.XlCMuR VX7K2In3xR1ZBysfoJ18uHsr91S3AxsDRBrMYvge3PTJ96PhdSFi.liZAUy5Vk.tOu3CfWWsE6FI DB2zc1LuW5DoyqbnG.tfMdHzuOt_tz9YZ4jy.4cZda676PPA39Cx5zAPGSY5Wzfv4XSyE9ZCLy8M iuJqezwLttdM6BhtwSHBjJqUakjeeZ4u5KaOjWBxXaj9Gl9XRyltJvI27kMYP7FvY4X6_uqZKXU_ 7wNSjObPuDCsGUV9m6vrUvDWImIZy_AQ6Wfiw5w84FNOOz.492XdZPmAukdNIVwtT9oDdb8CIryG aIMBAYaY_6vVGZxrd.lur.0eLpNZ7wk8Baj7Jv1kYLYKzE7BXZtiAobtiKgphEbCk9v8ZbXtJiXy dFUAcD7XOjpLggk0E4Dfh8cvTWM6SzD0sLQyx62M58F6XCIkZagklmmxrv03dcbRauw2SMaIdIqo bpaI.VU6YA0Xj4xLdI0j1VjhKNHMMzTVC1pdrbmzzB3i9n0hNyo1uqitEw7nACDPj.SkjX5CAhCe 9xbYIn_On7oR2fIG6aDpqjmgvk3cr6vnp0liC12HGyTMNyjd.0CWXA.R6ddI0qvrM5LO_ekM2wEk oMtmYXDo6tv3Hpx92yJF.XclrCbykvuIMAHzAllGHlWjU73YDGd3U1W7QZcs4STrZZqrtWWtbPI1 Dc1N3XEwL4W0e_bIoNFVk57Jq.bglOqL6vDs2LLxfqKIjz1Qe1PqSJ899g5PC4pDgiiTSPMtiRd3 m3Uiyf7KauVdCYj390lXHCWjMMiGd18q24wFPeV7Itczcd.9mXbwK.pmsuh_1EuJQWsNig0YhVY9 ekGDwZXwFr5_r6AvcoCW.uQt8Zpg6V7zi31_BHKaDuWbopSrv83K7bISmfdjGVz1i4hsjIluzMu1 oYlXtUHjBjJ4Rb5ZGxZCSxBszTfNJidky7j7VVmLj6HIk.cM8Ab_15.gqfnlpRHeKJ_jAo_n6aDv EOh1ttX6S8pZosRYHg0yu0l1kza_qYdBMhl_c0xgpdTRrwqtL2kXg1HoGgBCU2ag2CnMKsECzT8e LCDWiyHcrQe5AuBoemUedLl40rI1_kFB1XTpSqLOJOVYo9o.HMqrxLA9hjI0NwAj_0YznxVao7mg QBCcOfUPZoor9D6c_LTO20WP7wqav_LRgmrgYSF1Fmlx1jzXqGJcGoisZrmUgaD7vRKJ4FgUMexi 7tr4kqyrLEomNGXwZoGAki5M14D1k80G4amww_vavELuWFYv1yW.y.DN_s6m4KsfEIe5._yyJY9n Gft4xb4KF82y_.O9zLAjhj6lb_PYKLRKmLnThdLXSbcsD.tjrBngwCPwZkz.LjKfhxlcSIAcdDHg h3BJCJiFUggNkl15YsLaCQlOV.8ZAFFymS0gauTwau4GWsN6dvfuDWEIHg.7deztLO_JzbwfG6_t ezhDDXixb9mbyciJIho505floA98qXMt6bUhIjdzzdbN6eZttvhStIH0yBjR_JBuF9MT8xDI8sAd nn9dLkJth61t5betnSBzpmyJfAFq.IwstERTHp2Qb3YaBi6rIHeASax3KcV.0Y05OHDGNRn76M3u VEod.4iHiR5PEp9Kp9mVVGaOnIOL4oMoErXEkRClCtos1GIlvLrLg_gZJkt313mm6ZVXydw06x5D AYwKgpAcpWNzq9ffek6eU3mpzq1dh9R4mw4ECwZzabCJV3xUQ_lWDhZIgmA4ihaO9F9pbE4dWhyM 2TbhIV2UDZmx.27krGHvYSfi7i8APYaOsi9zdKFxFOM88MepcJjQCTAALdBBFdsZKYv7W1G37Itz wmAXPvyA_mtF7WHVIcVLj4krlPOBUPLTkxE0FV29ghO5zxmzRUoWGfw742zN2Vm4edQgq674ccFU LlD3MkFDTfjHdWfUH4d_vajXFRbbaR7kaTXkpOvNskMWT7.eOe5OB2h67eNKP.r0VFeidKSXY.an bgSYP07QYAOpjjmr__NoG00Gm77KApN.LuBJ.9HXfIYATpc7XbeLVQccJMoFzEBFB7RzxSPzuLww Rbmqhz0dKkyZAbzx251q6pY1MQeoM4Q8J1NTT.7X5c3ijzETevexr8ieT5sU.b4D6flY6FbTD0VD 8S1yddI_X2ZzwqiUsdh1MafjlcEH1tqhZ4AbAkm.CDQ-- X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic314.consmr.mail.ne1.yahoo.com with HTTP; Fri, 11 Jun 2021 00:23:37 +0000 Received: by kubenode504.mail-prod1.omega.ne1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID aa413c6f0a8e56062a1b9755d954798d; Fri, 11 Jun 2021 00:23:33 +0000 (UTC) From: Casey Schaufler To: casey.schaufler@intel.com, jmorris@namei.org, linux-security-module@vger.kernel.org, selinux@vger.kernel.org Subject: [PATCH v27 17/25] LSM: Use lsmcontext in security_inode_getsecctx Date: Thu, 10 Jun 2021 17:04:27 -0700 Message-Id: <20210611000435.36398-18-casey@schaufler-ca.com> In-Reply-To: <20210611000435.36398-1-casey@schaufler-ca.com> References: <20210611000435.36398-1-casey@schaufler-ca.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: linux-audit@redhat.com Cc: linux-nfs@vger.kernel.org, john.johansen@canonical.com, linux-kernel@vger.kernel.org, linux-audit@redhat.com, Chuck Lever , sds@tycho.nsa.gov X-BeenThere: linux-audit@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Linux Audit Discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-audit-bounces@redhat.com Errors-To: linux-audit-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=linux-audit-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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 Acked-by: Paul Moore Acked-by: Chuck Lever Reviewed-by: John Johansen Signed-off-by: Casey Schaufler Cc: linux-nfs@vger.kernel.org --- 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 089ec4b61ef1..fc7ba114c298 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -2727,11 +2727,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; @@ -2741,13 +2741,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 @@ -2844,9 +2844,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; @@ -2904,7 +2902,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); @@ -3324,8 +3322,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; } @@ -3346,10 +3343,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 666bd85e142b..0129400ff6e9 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -585,7 +585,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 */ @@ -1461,7 +1461,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 de7d5a9bdb76..a5150de2f3db 100644 --- a/security/security.c +++ b/security/security.c @@ -2397,9 +2397,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); -- 2.29.2 -- Linux-audit mailing list Linux-audit@redhat.com https://listman.redhat.com/mailman/listinfo/linux-audit