From: Casey Schaufler <casey@schaufler-ca.com>
To: casey.schaufler@intel.com, jmorris@namei.org,
linux-security-module@vger.kernel.org, selinux@vger.kernel.org
Cc: john.johansen@canonical.com, linux-audit@redhat.com, sds@tycho.nsa.gov
Subject: [PATCH v21 15/23] LSM: Use lsmcontext in security_inode_getsecctx
Date: Mon, 12 Oct 2020 13:19:16 -0700 [thread overview]
Message-ID: <20201012201924.71463-16-casey@schaufler-ca.com> (raw)
In-Reply-To: <20201012201924.71463-1-casey@schaufler-ca.com>
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 <sds@tycho.nsa.gov>
Acked-by: Paul Moore <paul@paul-moore.com>
Reviewed-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
---
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 0fc505392728..9352c05f3086 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -2600,11 +2600,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;
@@ -2614,13 +2614,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
@@ -2717,9 +2717,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;
@@ -2777,7 +2775,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);
@@ -3207,8 +3205,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;
}
@@ -3229,10 +3226,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 6ddfad740277..b845de9a4aad 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -561,7 +561,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 */
@@ -1400,7 +1400,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 32c66a74ca15..022af5ae8525 100644
--- a/security/security.c
+++ b/security/security.c
@@ -2265,9 +2265,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.24.1
--
Linux-audit mailing list
Linux-audit@redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit
next prev parent reply other threads:[~2020-10-12 20:36 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20201012201924.71463-1-casey.ref@schaufler-ca.com>
2020-10-12 20:19 ` [PATCH v21 00/23] LSM: Module stacking for AppArmor Casey Schaufler
2020-10-12 20:19 ` [PATCH v21 01/23] LSM: Infrastructure management of the sock security Casey Schaufler
2020-10-12 20:19 ` [PATCH v21 02/23] LSM: Create and manage the lsmblob data structure Casey Schaufler
2020-10-12 20:19 ` [PATCH v21 03/23] LSM: Use lsmblob in security_audit_rule_match Casey Schaufler
2020-10-12 20:19 ` [PATCH v21 04/23] LSM: Use lsmblob in security_kernel_act_as Casey Schaufler
2020-10-12 20:19 ` [PATCH v21 05/23] LSM: Use lsmblob in security_secctx_to_secid Casey Schaufler
2020-10-12 20:19 ` [PATCH v21 06/23] LSM: Use lsmblob in security_secid_to_secctx Casey Schaufler
2020-10-12 20:19 ` [PATCH v21 07/23] LSM: Use lsmblob in security_ipc_getsecid Casey Schaufler
2020-10-12 20:19 ` [PATCH v21 08/23] LSM: Use lsmblob in security_task_getsecid Casey Schaufler
2020-10-12 20:19 ` [PATCH v21 09/23] LSM: Use lsmblob in security_inode_getsecid Casey Schaufler
2020-10-12 20:19 ` [PATCH v21 10/23] LSM: Use lsmblob in security_cred_getsecid Casey Schaufler
2020-10-12 20:19 ` [PATCH v21 11/23] IMA: Change internal interfaces to use lsmblobs Casey Schaufler
2020-10-12 20:19 ` [PATCH v21 12/23] LSM: Specify which LSM to display Casey Schaufler
2020-10-12 20:19 ` [PATCH v21 13/23] LSM: Ensure the correct LSM context releaser Casey Schaufler
2020-10-12 20:19 ` [PATCH v21 14/23] LSM: Use lsmcontext in security_secid_to_secctx Casey Schaufler
2020-10-12 20:19 ` Casey Schaufler [this message]
2020-10-12 20:19 ` [PATCH v21 16/23] LSM: security_secid_to_secctx in netlink netfilter Casey Schaufler
2020-10-12 20:19 ` [PATCH v21 17/23] NET: Store LSM netlabel data in a lsmblob Casey Schaufler
2020-10-12 20:19 ` [PATCH v21 18/23] LSM: Verify LSM display sanity in binder Casey Schaufler
2020-10-12 20:19 ` [PATCH v21 19/23] audit: add support for non-syscall auxiliary records Casey Schaufler
2020-10-12 20:19 ` [PATCH v21 20/23] Audit: Add new record for multiple process LSM attributes Casey Schaufler
2020-10-12 20:19 ` [PATCH v21 21/23] Audit: Add a new record for multiple object " Casey Schaufler
2020-10-12 20:19 ` [PATCH v21 22/23] LSM: Add /proc attr entry for full LSM context Casey Schaufler
2020-10-12 20:19 ` [PATCH v21 23/23] AppArmor: Remove the exclusive flag Casey Schaufler
2020-10-29 11:26 ` [PATCH v21 00/23] LSM: Module stacking for AppArmor John Johansen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201012201924.71463-16-casey@schaufler-ca.com \
--to=casey@schaufler-ca.com \
--cc=casey.schaufler@intel.com \
--cc=jmorris@namei.org \
--cc=john.johansen@canonical.com \
--cc=linux-audit@redhat.com \
--cc=linux-security-module@vger.kernel.org \
--cc=sds@tycho.nsa.gov \
--cc=selinux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).