--- v2
+++ v38
@@ -1,253 +1,326 @@
-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. A lsmcontext is used within kernfs to store
-the security information as well.
+Change the security_cred_getsecid() interface to fill in a
+lsmblob instead of a u32 secid. The associated data elements
+in the audit sub-system are changed from a secid to a lsmblob
+to accommodate multiple possible LSM audit users.
+Reviewed-by: Kees Cook <keescook@chromium.org>
+Reviewed-by: John Johansen <john.johansen@canonical.com>
+Acked-by: Stephen Smalley <stephen.smalley.work@gmail.com>
+Acked-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
+Cc: linux-integrity@vger.kernel.org
+Cc: linux-audit@redhat.com
---
- fs/kernfs/dir.c | 8 ++------
- fs/kernfs/inode.c | 34 ++++++++++++----------------------
- fs/kernfs/kernfs-internal.h | 3 +--
- fs/nfsd/nfs4xdr.c | 23 +++++++++--------------
- include/linux/security.h | 5 +++--
- security/security.c | 13 +++++++++++--
- 6 files changed, 38 insertions(+), 48 deletions(-)
+ drivers/android/binder.c | 12 +----------
+ include/linux/security.h | 7 ++++---
+ kernel/audit.c | 25 +++++++----------------
+ kernel/audit.h | 3 ++-
+ kernel/auditsc.c | 33 +++++++++++--------------------
+ security/integrity/ima/ima_main.c | 4 +---
+ security/security.c | 12 ++++++++---
+ 7 files changed, 36 insertions(+), 60 deletions(-)
-diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
-index 92afad387237..1d000289d8b7 100644
---- a/fs/kernfs/dir.c
-+++ b/fs/kernfs/dir.c
-@@ -532,12 +532,8 @@ void kernfs_put(struct kernfs_node *kn)
- kfree_const(kn->name);
-
- if (kn->iattr) {
-- struct lsmcontext scaff; /* scaffolding */
-- if (kn->iattr->ia_secdata) {
-- lsmcontext_init(&scaff, kn->iattr->ia_secdata,
-- kn->iattr->ia_secdata_len, 0);
-- security_release_secctx(&scaff);
-- }
-+ if (kn->iattr->ia_context.context)
-+ security_release_secctx(&kn->iattr->ia_context);
- simple_xattrs_free(&kn->iattr->xattrs);
- kmem_cache_free(kernfs_iattrs_cache, kn->iattr);
- }
-diff --git a/fs/kernfs/inode.c b/fs/kernfs/inode.c
-index 02cde9dac5ee..ffbf7863306d 100644
---- a/fs/kernfs/inode.c
-+++ b/fs/kernfs/inode.c
-@@ -135,21 +135,14 @@ int kernfs_iop_setattr(struct dentry *dentry, struct iattr *iattr)
- return error;
- }
-
--static int kernfs_node_setsecdata(struct kernfs_iattrs *attrs, void **secdata,
-- u32 *secdata_len)
-+static void kernfs_node_setsecdata(struct kernfs_iattrs *attrs,
-+ struct lsmcontext *cp)
- {
-- void *old_secdata;
-- size_t old_secdata_len;
-+ struct lsmcontext old_context;
-
-- old_secdata = attrs->ia_secdata;
-- old_secdata_len = attrs->ia_secdata_len;
--
-- attrs->ia_secdata = *secdata;
-- attrs->ia_secdata_len = *secdata_len;
--
-- *secdata = old_secdata;
-- *secdata_len = old_secdata_len;
-- return 0;
-+ old_context = attrs->ia_context;
-+ attrs->ia_context = *cp;
-+ *cp = old_context;
- }
-
- ssize_t kernfs_iop_listxattr(struct dentry *dentry, char *buf, size_t size)
-@@ -192,8 +185,8 @@ static void kernfs_refresh_inode(struct kernfs_node *kn, struct inode *inode)
- * persistent copy in kernfs_node.
- */
- set_inode_attr(inode, &attrs->ia_iattr);
-- security_inode_notifysecctx(inode, attrs->ia_secdata,
-- attrs->ia_secdata_len);
-+ security_inode_notifysecctx(inode, attrs->ia_context.context,
-+ attrs->ia_context.len);
- }
-
- if (kernfs_type(kn) == KERNFS_DIR)
-@@ -350,8 +343,6 @@ static int kernfs_security_xattr_set(const struct xattr_handler *handler,
- struct kernfs_node *kn = inode->i_private;
- struct kernfs_iattrs *attrs;
- struct lsmcontext context;
-- void *secdata;
-- u32 secdata_len = 0;
- int error;
-
- attrs = kernfs_iattrs(kn);
-@@ -361,18 +352,17 @@ static int kernfs_security_xattr_set(const struct xattr_handler *handler,
- error = security_inode_setsecurity(inode, suffix, value, size, flags);
- if (error)
- return error;
-- error = security_inode_getsecctx(inode, &secdata, &secdata_len);
-+ error = security_inode_getsecctx(inode, &context);
- if (error)
- return error;
-
- mutex_lock(&kernfs_mutex);
-- error = kernfs_node_setsecdata(attrs, &secdata, &secdata_len);
-+ kernfs_node_setsecdata(attrs, &context);
- mutex_unlock(&kernfs_mutex);
-
-- if (secdata) {
-- lsmcontext_init(&context, secdata, secdata_len, 0);
-+ if (context.context)
- security_release_secctx(&context);
-- }
-+
- return error;
- }
-
-diff --git a/fs/kernfs/kernfs-internal.h b/fs/kernfs/kernfs-internal.h
-index 0b7d197a904c..844a028d282f 100644
---- a/fs/kernfs/kernfs-internal.h
-+++ b/fs/kernfs/kernfs-internal.h
-@@ -21,8 +21,7 @@
-
- struct kernfs_iattrs {
- struct iattr ia_iattr;
-- void *ia_secdata;
-- u32 ia_secdata_len;
-+ struct lsmcontext ia_context;
-
- struct simple_xattrs xattrs;
- };
-diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
-index bb3db033e144..1209083565dd 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
-
-@@ -2420,9 +2420,7 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
- __be32 status;
- int err;
- struct nfs4_acl *acl = NULL;
-- struct lsmcontext scaff; /* scaffolding */
-- void *context = NULL;
-- int contextlen;
-+ struct lsmcontext context;
- bool contextsupport = false;
- struct nfsd4_compoundres *resp = rqstp->rq_resp;
- u32 minorversion = resp->cstate.minorversion;
-@@ -2479,7 +2477,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);
-@@ -2908,8 +2906,7 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
- }
-
- 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;
- }
-@@ -2920,10 +2917,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/drivers/android/binder.c b/drivers/android/binder.c
+index 0ab1d5179fc4..6e1e35de1fcb 100644
+--- a/drivers/android/binder.c
++++ b/drivers/android/binder.c
+@@ -3171,18 +3171,8 @@ static void binder_transaction(struct binder_proc *proc,
+ if (target_node && target_node->txn_security_ctx) {
+ struct lsmblob blob;
+ size_t added_size;
+- u32 secid;
+
+- security_cred_getsecid(proc->cred, &secid);
+- /*
+- * Later in this patch set security_cred_getsecid() will
+- * provide a lsmblob instead of a secid. lsmblob_init
+- * is used to ensure that all the secids in the lsmblob
+- * get the value returned from security_cred_getsecid(),
+- * which means that the one expected by
+- * security_secid_to_secctx() will be set.
+- */
+- lsmblob_init(&blob, secid);
++ security_cred_getsecid(proc->cred, &blob);
+ ret = security_secid_to_secctx(&blob, &secctx, &secctx_sz);
+ if (ret) {
+ binder_txn_error("%d:%d failed to get security context\n",
diff --git a/include/linux/security.h b/include/linux/security.h
-index 92c4960dd57f..9f26ea11d307 100644
+index ca5dcaee7c23..9f80b685542d 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
-@@ -483,7 +483,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);
- #else /* CONFIG_SECURITY */
-
- static inline int call_lsm_notifier(enum lsm_event event, void *data)
-@@ -1284,7 +1284,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;
+@@ -521,7 +521,7 @@ int security_cred_alloc_blank(struct cred *cred, gfp_t gfp);
+ void security_cred_free(struct cred *cred);
+ int security_prepare_creds(struct cred *new, const struct cred *old, gfp_t gfp);
+ void security_transfer_creds(struct cred *new, const struct cred *old);
+-void security_cred_getsecid(const struct cred *c, u32 *secid);
++void security_cred_getsecid(const struct cred *c, struct lsmblob *blob);
+ int security_kernel_act_as(struct cred *new, struct lsmblob *blob);
+ int security_kernel_create_files_as(struct cred *new, struct inode *inode);
+ int security_kernel_module_request(char *kmod_name);
+@@ -1162,9 +1162,10 @@ static inline void security_transfer_creds(struct cred *new,
+ {
+ }
+
+-static inline void security_cred_getsecid(const struct cred *c, u32 *secid)
++static inline void security_cred_getsecid(const struct cred *c,
++ struct lsmblob *blob)
+ {
+- *secid = 0;
++ lsmblob_init(blob, 0);
+ }
+
+ static inline int security_kernel_act_as(struct cred *cred,
+diff --git a/kernel/audit.c b/kernel/audit.c
+index 4e13e48afc06..3d026013e6eb 100644
+--- a/kernel/audit.c
++++ b/kernel/audit.c
+@@ -125,7 +125,7 @@ static u32 audit_backlog_wait_time = AUDIT_BACKLOG_WAIT_TIME;
+ /* The identity of the user shutting down the audit system. */
+ static kuid_t audit_sig_uid = INVALID_UID;
+ static pid_t audit_sig_pid = -1;
+-static u32 audit_sig_sid;
++static struct lsmblob audit_sig_lsm;
+
+ /* Records can be lost in several ways:
+ 0) [suppressed in audit_alloc]
+@@ -1463,29 +1463,21 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
+ }
+ case AUDIT_SIGNAL_INFO:
+ len = 0;
+- if (audit_sig_sid) {
+- struct lsmblob blob;
+-
+- /*
+- * lsmblob_init sets all values in the lsmblob
+- * to audit_sig_sid. This is temporary until
+- * audit_sig_sid is converted to a lsmblob, which
+- * happens later in this patch set.
+- */
+- lsmblob_init(&blob, audit_sig_sid);
+- err = security_secid_to_secctx(&blob, &ctx, &len);
++ if (lsmblob_is_set(&audit_sig_lsm)) {
++ err = security_secid_to_secctx(&audit_sig_lsm, &ctx,
++ &len);
+ if (err)
+ return err;
+ }
+ sig_data = kmalloc(struct_size(sig_data, ctx, len), GFP_KERNEL);
+ if (!sig_data) {
+- if (audit_sig_sid)
++ if (lsmblob_is_set(&audit_sig_lsm))
+ security_release_secctx(ctx, len);
+ return -ENOMEM;
+ }
+ sig_data->uid = from_kuid(&init_user_ns, audit_sig_uid);
+ sig_data->pid = audit_sig_pid;
+- if (audit_sig_sid) {
++ if (lsmblob_is_set(&audit_sig_lsm)) {
+ memcpy(sig_data->ctx, ctx, len);
+ security_release_secctx(ctx, len);
+ }
+@@ -2392,7 +2384,6 @@ int audit_set_loginuid(kuid_t loginuid)
+ int audit_signal_info(int sig, struct task_struct *t)
+ {
+ kuid_t uid = current_uid(), auid;
+- struct lsmblob blob;
+
+ if (auditd_test_task(t) &&
+ (sig == SIGTERM || sig == SIGHUP ||
+@@ -2403,9 +2394,7 @@ int audit_signal_info(int sig, struct task_struct *t)
+ audit_sig_uid = auid;
+ else
+ audit_sig_uid = uid;
+- security_current_getsecid_subj(&blob);
+- /* scaffolding until audit_sig_sid is converted */
+- audit_sig_sid = lsmblob_first(&blob);
++ security_current_getsecid_subj(&audit_sig_lsm);
+ }
+
+ return audit_signal_info_syscall(t);
+diff --git a/kernel/audit.h b/kernel/audit.h
+index 58b66543b4d5..316fac62d5f7 100644
+--- a/kernel/audit.h
++++ b/kernel/audit.h
+@@ -12,6 +12,7 @@
+ #include <linux/fs.h>
+ #include <linux/audit.h>
+ #include <linux/skbuff.h>
++#include <linux/security.h>
+ #include <uapi/linux/mqueue.h>
+ #include <linux/tty.h>
+ #include <uapi/linux/openat2.h> // struct open_how
+@@ -143,7 +144,7 @@ struct audit_context {
+ kuid_t target_auid;
+ kuid_t target_uid;
+ unsigned int target_sessionid;
+- u32 target_sid;
++ struct lsmblob target_lsm;
+ char target_comm[TASK_COMM_LEN];
+
+ struct audit_tree_refs *trees, *first_trees;
+diff --git a/kernel/auditsc.c b/kernel/auditsc.c
+index ad5f33af3b50..092aba46a9b3 100644
+--- a/kernel/auditsc.c
++++ b/kernel/auditsc.c
+@@ -99,7 +99,7 @@ struct audit_aux_data_pids {
+ kuid_t target_auid[AUDIT_AUX_PIDS];
+ kuid_t target_uid[AUDIT_AUX_PIDS];
+ unsigned int target_sessionid[AUDIT_AUX_PIDS];
+- u32 target_sid[AUDIT_AUX_PIDS];
++ struct lsmblob target_lsm[AUDIT_AUX_PIDS];
+ char target_comm[AUDIT_AUX_PIDS][TASK_COMM_LEN];
+ int pid_count;
+ };
+@@ -1018,7 +1018,7 @@ static void audit_reset_context(struct audit_context *ctx)
+ ctx->target_pid = 0;
+ ctx->target_auid = ctx->target_uid = KUIDT_INIT(0);
+ ctx->target_sessionid = 0;
+- ctx->target_sid = 0;
++ lsmblob_init(&ctx->target_lsm, 0);
+ ctx->target_comm[0] = '\0';
+ unroll_tree_refs(ctx, NULL, 0);
+ WARN_ON(!list_empty(&ctx->killed_trees));
+@@ -1091,14 +1091,14 @@ static inline void audit_free_context(struct audit_context *context)
+ }
+
+ static int audit_log_pid_context(struct audit_context *context, pid_t pid,
+- kuid_t auid, kuid_t uid, unsigned int sessionid,
+- u32 sid, char *comm)
++ kuid_t auid, kuid_t uid,
++ unsigned int sessionid,
++ struct lsmblob *blob, char *comm)
+ {
+ struct audit_buffer *ab;
+ char *ctx = NULL;
+ u32 len;
+ int rc = 0;
+- struct lsmblob blob;
+
+ ab = audit_log_start(context, GFP_KERNEL, AUDIT_OBJ_PID);
+ if (!ab)
+@@ -1107,9 +1107,8 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid,
+ audit_log_format(ab, "opid=%d oauid=%d ouid=%d oses=%d", pid,
+ from_kuid(&init_user_ns, auid),
+ from_kuid(&init_user_ns, uid), sessionid);
+- if (sid) {
+- lsmblob_init(&blob, sid);
+- if (security_secid_to_secctx(&blob, &ctx, &len)) {
++ if (lsmblob_is_set(blob)) {
++ if (security_secid_to_secctx(blob, &ctx, &len)) {
+ audit_log_format(ab, " obj=(none)");
+ rc = 1;
+ } else {
+@@ -1789,7 +1788,7 @@ static void audit_log_exit(void)
+ axs->target_auid[i],
+ axs->target_uid[i],
+ axs->target_sessionid[i],
+- axs->target_sid[i],
++ &axs->target_lsm[i],
+ axs->target_comm[i]))
+ call_panic = 1;
+ }
+@@ -1798,7 +1797,7 @@ static void audit_log_exit(void)
+ audit_log_pid_context(context, context->target_pid,
+ context->target_auid, context->target_uid,
+ context->target_sessionid,
+- context->target_sid, context->target_comm))
++ &context->target_lsm, context->target_comm))
+ call_panic = 1;
+
+ if (context->pwd.dentry && context->pwd.mnt) {
+@@ -2740,15 +2739,12 @@ int __audit_sockaddr(int len, void *a)
+ void __audit_ptrace(struct task_struct *t)
+ {
+ struct audit_context *context = audit_context();
+- struct lsmblob blob;
+
+ context->target_pid = task_tgid_nr(t);
+ context->target_auid = audit_get_loginuid(t);
+ context->target_uid = task_uid(t);
+ context->target_sessionid = audit_get_sessionid(t);
+- security_task_getsecid_obj(t, &blob);
+- /* scaffolding - until target_sid is converted */
+- context->target_sid = lsmblob_first(&blob);
++ security_task_getsecid_obj(t, &context->target_lsm);
+ memcpy(context->target_comm, t->comm, TASK_COMM_LEN);
+ }
+
+@@ -2764,7 +2760,6 @@ int audit_signal_info_syscall(struct task_struct *t)
+ struct audit_aux_data_pids *axp;
+ struct audit_context *ctx = audit_context();
+ kuid_t t_uid = task_uid(t);
+- struct lsmblob blob;
+
+ if (!audit_signals || audit_dummy_context())
+ return 0;
+@@ -2776,9 +2771,7 @@ int audit_signal_info_syscall(struct task_struct *t)
+ ctx->target_auid = audit_get_loginuid(t);
+ ctx->target_uid = t_uid;
+ ctx->target_sessionid = audit_get_sessionid(t);
+- security_task_getsecid_obj(t, &blob);
+- /* scaffolding until target_sid is converted */
+- ctx->target_sid = lsmblob_first(&blob);
++ security_task_getsecid_obj(t, &ctx->target_lsm);
+ memcpy(ctx->target_comm, t->comm, TASK_COMM_LEN);
+ return 0;
+ }
+@@ -2799,9 +2792,7 @@ int audit_signal_info_syscall(struct task_struct *t)
+ axp->target_auid[axp->pid_count] = audit_get_loginuid(t);
+ axp->target_uid[axp->pid_count] = t_uid;
+ axp->target_sessionid[axp->pid_count] = audit_get_sessionid(t);
+- security_task_getsecid_obj(t, &blob);
+- /* scaffolding until target_sid is converted */
+- axp->target_sid[axp->pid_count] = lsmblob_first(&blob);
++ security_task_getsecid_obj(t, &axp->target_lsm[axp->pid_count]);
+ memcpy(axp->target_comm[axp->pid_count], t->comm, TASK_COMM_LEN);
+ axp->pid_count++;
+
+diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
+index 25870eb422d9..ecaa0b96bb26 100644
+--- a/security/integrity/ima/ima_main.c
++++ b/security/integrity/ima/ima_main.c
+@@ -488,7 +488,6 @@ int ima_file_mprotect(struct vm_area_struct *vma, unsigned long prot)
+ int ima_bprm_check(struct linux_binprm *bprm)
+ {
+ int ret;
+- u32 secid;
+ struct lsmblob blob;
+
+ security_current_getsecid_subj(&blob);
+@@ -497,8 +496,7 @@ int ima_bprm_check(struct linux_binprm *bprm)
+ if (ret)
+ return ret;
+
+- security_cred_getsecid(bprm->cred, &secid);
+- lsmblob_init(&blob, secid);
++ security_cred_getsecid(bprm->cred, &blob);
+ return process_measurement(bprm->file, bprm->cred, &blob, NULL, 0,
+ MAY_EXEC, CREDS_CHECK);
}
diff --git a/security/security.c b/security/security.c
-index 23d8049ec0c1..7b8427560646 100644
+index 563452000729..80133d6e982c 100644
--- a/security/security.c
+++ b/security/security.c
-@@ -2131,9 +2131,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);
-+ int *display = current->security;
+@@ -1829,10 +1829,16 @@ void security_transfer_creds(struct cred *new, const struct cred *old)
+ call_void_hook(cred_transfer, new, old);
+ }
+
+-void security_cred_getsecid(const struct cred *c, u32 *secid)
++void security_cred_getsecid(const struct cred *c, struct lsmblob *blob)
+ {
+- *secid = 0;
+- call_void_hook(cred_getsecid, c, secid);
+ struct security_hook_list *hp;
+
-+ hlist_for_each_entry(hp, &security_hook_heads.inode_getsecctx, list)
-+ if (*display == 0 || *display == hp->slot) {
-+ cp->slot = hp->slot;
-+ return hp->hook.inode_getsecctx(inode,
-+ (void **)&cp->context, &cp->len);
-+ }
-+ return -EOPNOTSUPP;
- }
- EXPORT_SYMBOL(security_inode_getsecctx);
++ lsmblob_init(blob, 0);
++ hlist_for_each_entry(hp, &security_hook_heads.cred_getsecid, list) {
++ if (WARN_ON(hp->lsmid->slot < 0 || hp->lsmid->slot >= lsm_slot))
++ continue;
++ hp->hook.cred_getsecid(c, &blob->secid[hp->lsmid->slot]);
++ }
+ }
+ EXPORT_SYMBOL(security_cred_getsecid);
--
-2.20.1
+2.37.3