--- v3
+++ v31
@@ -1,228 +1,567 @@
-Create a new entry "display" in /proc/.../attr for controlling
-which LSM security information is displayed for a process.
-The name of an active LSM that supplies hooks for human readable
-data may be written to "display" to set the value. The name of
-the LSM currently in use can be read from "display".
-At this point there can only be one LSM capable of display
-active.
+Add a new lsmcontext data structure to hold all the information
+about a "security context", including the string, its size and
+which LSM allocated the string. The allocation information is
+necessary because LSMs have different policies regarding the
+lifecycle of these strings. SELinux allocates and destroys
+them on each use, whereas Smack provides a pointer to an entry
+in a list that never goes away.
+Reviewed-by: Kees Cook <keescook@chromium.org>
+Reviewed-by: John Johansen <john.johansen@canonical.com>
+Acked-by: Paul Moore <paul@paul-moore.com>
+Acked-by: Stephen Smalley <stephen.smalley.work@gmail.com>
+Acked-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
+Cc: linux-integrity@vger.kernel.org
+Cc: netdev@vger.kernel.org
+Cc: linux-audit@redhat.com
+Cc: netfilter-devel@vger.kernel.org
+To: Pablo Neira Ayuso <pablo@netfilter.org>
+Cc: linux-nfs@vger.kernel.org
---
- fs/proc/base.c | 1 +
- security/security.c | 110 +++++++++++++++++++++++++++++++++++---------
- 2 files changed, 90 insertions(+), 21 deletions(-)
+ drivers/android/binder.c | 10 ++++---
+ fs/ceph/xattr.c | 6 ++++-
+ fs/nfs/nfs4proc.c | 8 ++++--
+ fs/nfsd/nfs4xdr.c | 7 +++--
+ include/linux/security.h | 35 +++++++++++++++++++++++--
+ include/net/scm.h | 5 +++-
+ kernel/audit.c | 14 +++++++---
+ kernel/auditsc.c | 12 ++++++---
+ net/ipv4/ip_sockglue.c | 4 ++-
+ net/netfilter/nf_conntrack_netlink.c | 4 ++-
+ net/netfilter/nf_conntrack_standalone.c | 4 ++-
+ net/netfilter/nfnetlink_queue.c | 13 ++++++---
+ net/netlabel/netlabel_unlabeled.c | 19 +++++++++++---
+ net/netlabel/netlabel_user.c | 4 ++-
+ security/security.c | 11 ++++----
+ 15 files changed, 121 insertions(+), 35 deletions(-)
-diff --git a/fs/proc/base.c b/fs/proc/base.c
-index ddef482f1334..7bf70e041315 100644
---- a/fs/proc/base.c
-+++ b/fs/proc/base.c
-@@ -2618,6 +2618,7 @@ static const struct pid_entry attr_dir_stuff[] = {
- ATTR(NULL, "fscreate", 0666),
- ATTR(NULL, "keycreate", 0666),
- ATTR(NULL, "sockcreate", 0666),
-+ ATTR(NULL, "display", 0666),
- #ifdef CONFIG_SECURITY_SMACK
- DIR("smack", 0555,
- proc_smack_attr_dir_inode_ops, proc_smack_attr_dir_ops),
+diff --git a/drivers/android/binder.c b/drivers/android/binder.c
+index 27b53e5f71a1..32dca5b40e8a 100644
+--- a/drivers/android/binder.c
++++ b/drivers/android/binder.c
+@@ -2469,6 +2469,7 @@ static void binder_transaction(struct binder_proc *proc,
+ int t_debug_id = atomic_inc_return(&binder_last_id);
+ char *secctx = NULL;
+ u32 secctx_sz = 0;
++ struct lsmcontext scaff; /* scaffolding */
+
+ e = binder_transaction_log_add(&binder_transaction_log);
+ e->debug_id = t_debug_id;
+@@ -2771,7 +2772,8 @@ static void binder_transaction(struct binder_proc *proc,
+ t->security_ctx = 0;
+ WARN_ON(1);
+ }
+- security_release_secctx(secctx, secctx_sz);
++ lsmcontext_init(&scaff, secctx, secctx_sz, 0);
++ security_release_secctx(&scaff);
+ secctx = NULL;
+ }
+ t->buffer->debug_id = t->debug_id;
+@@ -3112,8 +3114,10 @@ static void binder_transaction(struct binder_proc *proc,
+ binder_alloc_free_buf(&target_proc->alloc, t->buffer);
+ err_binder_alloc_buf_failed:
+ err_bad_extra_size:
+- if (secctx)
+- security_release_secctx(secctx, secctx_sz);
++ if (secctx) {
++ lsmcontext_init(&scaff, secctx, secctx_sz, 0);
++ security_release_secctx(&scaff);
++ }
+ err_get_secctx_failed:
+ kfree(tcomplete);
+ binder_stats_deleted(BINDER_STAT_TRANSACTION_COMPLETE);
+diff --git a/fs/ceph/xattr.c b/fs/ceph/xattr.c
+index fcf7dfdecf96..df2b3bf46364 100644
+--- a/fs/ceph/xattr.c
++++ b/fs/ceph/xattr.c
+@@ -1374,12 +1374,16 @@ int ceph_security_init_secctx(struct dentry *dentry, umode_t mode,
+
+ void ceph_release_acl_sec_ctx(struct ceph_acl_sec_ctx *as_ctx)
+ {
++#ifdef CONFIG_CEPH_FS_SECURITY_LABEL
++ struct lsmcontext scaff; /* scaffolding */
++#endif
+ #ifdef CONFIG_CEPH_FS_POSIX_ACL
+ posix_acl_release(as_ctx->acl);
+ posix_acl_release(as_ctx->default_acl);
+ #endif
+ #ifdef CONFIG_CEPH_FS_SECURITY_LABEL
+- security_release_secctx(as_ctx->sec_ctx, as_ctx->sec_ctxlen);
++ lsmcontext_init(&scaff, as_ctx->sec_ctx, as_ctx->sec_ctxlen, 0);
++ security_release_secctx(&scaff);
+ #endif
+ if (as_ctx->pagelist)
+ ceph_pagelist_release(as_ctx->pagelist);
+diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
+index ee3bc79f6ca3..194bb09663e0 100644
+--- a/fs/nfs/nfs4proc.c
++++ b/fs/nfs/nfs4proc.c
+@@ -137,8 +137,12 @@ nfs4_label_init_security(struct inode *dir, struct dentry *dentry,
+ static inline void
+ nfs4_label_release_security(struct nfs4_label *label)
+ {
+- if (label)
+- security_release_secctx(label->label, label->len);
++ struct lsmcontext scaff; /* scaffolding */
++
++ if (label) {
++ lsmcontext_init(&scaff, label->label, label->len, 0);
++ security_release_secctx(&scaff);
++ }
+ }
+ static inline u32 *nfs4_bitmask(struct nfs_server *server, struct nfs4_label *label)
+ {
+diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
+index 5a93a5db4fb0..f96da9ac116a 100644
+--- a/fs/nfsd/nfs4xdr.c
++++ b/fs/nfsd/nfs4xdr.c
+@@ -2841,6 +2841,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;
+ #endif
+@@ -3342,8 +3343,10 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
+
+ out:
+ #ifdef CONFIG_NFSD_V4_SECURITY_LABEL
+- if (context)
+- security_release_secctx(context, contextlen);
++ if (context) {
++ lsmcontext_init(&scaff, context, contextlen, 0); /*scaffolding*/
++ security_release_secctx(&scaff);
++ }
+ #endif /* CONFIG_NFSD_V4_SECURITY_LABEL */
+ kfree(acl);
+ if (tempfh) {
+diff --git a/include/linux/security.h b/include/linux/security.h
+index 872e543d37dd..e439663c955f 100644
+--- a/include/linux/security.h
++++ b/include/linux/security.h
+@@ -135,6 +135,37 @@ enum lockdown_reason {
+
+ extern const char *const lockdown_reasons[LOCKDOWN_CONFIDENTIALITY_MAX+1];
+
++/*
++ * A "security context" is the text representation of
++ * the information used by LSMs.
++ * This structure contains the string, its length, and which LSM
++ * it is useful for.
++ */
++struct lsmcontext {
++ char *context; /* Provided by the module */
++ u32 len;
++ int slot; /* Identifies the module */
++};
++
++/**
++ * lsmcontext_init - initialize an lsmcontext structure.
++ * @cp: Pointer to the context to initialize
++ * @context: Initial context, or NULL
++ * @size: Size of context, or 0
++ * @slot: Which LSM provided the context
++ *
++ * Fill in the lsmcontext from the provided information.
++ * This is a scaffolding function that will be removed when
++ * lsmcontext integration is complete.
++ */
++static inline void lsmcontext_init(struct lsmcontext *cp, char *context,
++ u32 size, int slot)
++{
++ cp->slot = slot;
++ cp->context = context;
++ cp->len = size;
++}
++
+ /*
+ * Data exported by the security modules
+ *
+@@ -570,7 +601,7 @@ int security_ismaclabel(const char *name);
+ int security_secid_to_secctx(struct lsmblob *blob, char **secdata, u32 *seclen);
+ int security_secctx_to_secid(const char *secdata, u32 seclen,
+ struct lsmblob *blob);
+-void security_release_secctx(char *secdata, u32 seclen);
++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);
+@@ -1440,7 +1471,7 @@ static inline int security_secctx_to_secid(const char *secdata,
+ return -EOPNOTSUPP;
+ }
+
+-static inline void security_release_secctx(char *secdata, u32 seclen)
++static inline void security_release_secctx(struct lsmcontext *cp)
+ {
+ }
+
+diff --git a/include/net/scm.h b/include/net/scm.h
+index 23a35ff1b3f2..f273c4d777ec 100644
+--- a/include/net/scm.h
++++ b/include/net/scm.h
+@@ -92,6 +92,7 @@ static __inline__ int scm_send(struct socket *sock, struct msghdr *msg,
+ #ifdef CONFIG_SECURITY_NETWORK
+ static inline void scm_passec(struct socket *sock, struct msghdr *msg, struct scm_cookie *scm)
+ {
++ struct lsmcontext context;
+ struct lsmblob lb;
+ char *secdata;
+ u32 seclen;
+@@ -106,7 +107,9 @@ static inline void scm_passec(struct socket *sock, struct msghdr *msg, struct sc
+
+ if (!err) {
+ put_cmsg(msg, SOL_SOCKET, SCM_SECURITY, seclen, secdata);
+- security_release_secctx(secdata, seclen);
++ /*scaffolding*/
++ lsmcontext_init(&context, secdata, seclen, 0);
++ security_release_secctx(&context);
+ }
+ }
+ }
+diff --git a/kernel/audit.c b/kernel/audit.c
+index 8ec64e6e8bc0..c17ec23158c4 100644
+--- a/kernel/audit.c
++++ b/kernel/audit.c
+@@ -1192,6 +1192,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
+ struct audit_sig_info *sig_data;
+ char *ctx = NULL;
+ u32 len;
++ struct lsmcontext scaff; /* scaffolding */
+
+ err = audit_netlink_ok(skb, msg_type);
+ if (err)
+@@ -1449,15 +1450,18 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
+ }
+ sig_data = kmalloc(sizeof(*sig_data) + len, GFP_KERNEL);
+ if (!sig_data) {
+- if (lsmblob_is_set(&audit_sig_lsm))
+- security_release_secctx(ctx, len);
++ if (lsmblob_is_set(&audit_sig_lsm)) {
++ lsmcontext_init(&scaff, ctx, len, 0);
++ security_release_secctx(&scaff);
++ }
+ return -ENOMEM;
+ }
+ sig_data->uid = from_kuid(&init_user_ns, audit_sig_uid);
+ sig_data->pid = audit_sig_pid;
+ if (lsmblob_is_set(&audit_sig_lsm)) {
+ memcpy(sig_data->ctx, ctx, len);
+- security_release_secctx(ctx, len);
++ lsmcontext_init(&scaff, ctx, len, 0);
++ security_release_secctx(&scaff);
+ }
+ audit_send_reply(skb, seq, AUDIT_SIGNAL_INFO, 0, 0,
+ sig_data, sizeof(*sig_data) + len);
+@@ -2132,6 +2136,7 @@ int audit_log_task_context(struct audit_buffer *ab)
+ unsigned len;
+ int error;
+ struct lsmblob blob;
++ struct lsmcontext scaff; /* scaffolding */
+
+ security_task_getsecid_subj(current, &blob);
+ if (!lsmblob_is_set(&blob))
+@@ -2145,7 +2150,8 @@ int audit_log_task_context(struct audit_buffer *ab)
+ }
+
+ audit_log_format(ab, " subj=%s", ctx);
+- security_release_secctx(ctx, len);
++ lsmcontext_init(&scaff, ctx, len, 0);
++ security_release_secctx(&scaff);
+ return 0;
+
+ error_path:
+diff --git a/kernel/auditsc.c b/kernel/auditsc.c
+index 930254bca7b5..3c72ff647fd8 100644
+--- a/kernel/auditsc.c
++++ b/kernel/auditsc.c
+@@ -1112,6 +1112,7 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid,
+ struct lsmblob *blob, char *comm)
+ {
+ struct audit_buffer *ab;
++ struct lsmcontext lsmcxt;
+ char *ctx = NULL;
+ u32 len;
+ int rc = 0;
+@@ -1129,7 +1130,8 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid,
+ rc = 1;
+ } else {
+ audit_log_format(ab, " obj=%s", ctx);
+- security_release_secctx(ctx, len);
++ lsmcontext_init(&lsmcxt, ctx, len, 0); /*scaffolding*/
++ security_release_secctx(&lsmcxt);
+ }
+ }
+ audit_log_format(ab, " ocomm=");
+@@ -1342,6 +1344,7 @@ static void audit_log_fcaps(struct audit_buffer *ab, struct audit_names *name)
+
+ static void show_special(struct audit_context *context, int *call_panic)
+ {
++ struct lsmcontext lsmcxt;
+ struct audit_buffer *ab;
+ int i;
+
+@@ -1376,7 +1379,8 @@ static void show_special(struct audit_context *context, int *call_panic)
+ *call_panic = 1;
+ } else {
+ audit_log_format(ab, " obj=%s", ctx);
+- security_release_secctx(ctx, len);
++ lsmcontext_init(&lsmcxt, ctx, len, 0);
++ security_release_secctx(&lsmcxt);
+ }
+ }
+ if (context->ipc.has_perm) {
+@@ -1533,6 +1537,7 @@ static void audit_log_name(struct audit_context *context, struct audit_names *n,
+ char *ctx = NULL;
+ u32 len;
+ struct lsmblob blob;
++ struct lsmcontext lsmcxt;
+
+ lsmblob_init(&blob, n->osid);
+ if (security_secid_to_secctx(&blob, &ctx, &len)) {
+@@ -1541,7 +1546,8 @@ static void audit_log_name(struct audit_context *context, struct audit_names *n,
+ *call_panic = 2;
+ } else {
+ audit_log_format(ab, " obj=%s", ctx);
+- security_release_secctx(ctx, len);
++ lsmcontext_init(&lsmcxt, ctx, len, 0); /* scaffolding */
++ security_release_secctx(&lsmcxt);
+ }
+ }
+
+diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
+index be7073df19a5..dbba700fb151 100644
+--- a/net/ipv4/ip_sockglue.c
++++ b/net/ipv4/ip_sockglue.c
+@@ -130,6 +130,7 @@ static void ip_cmsg_recv_checksum(struct msghdr *msg, struct sk_buff *skb,
+
+ static void ip_cmsg_recv_security(struct msghdr *msg, struct sk_buff *skb)
+ {
++ struct lsmcontext context;
+ struct lsmblob lb;
+ char *secdata;
+ u32 seclen, secid;
+@@ -145,7 +146,8 @@ static void ip_cmsg_recv_security(struct msghdr *msg, struct sk_buff *skb)
+ return;
+
+ put_cmsg(msg, SOL_IP, SCM_SECURITY, seclen, secdata);
+- security_release_secctx(secdata, seclen);
++ lsmcontext_init(&context, secdata, seclen, 0); /* scaffolding */
++ security_release_secctx(&context);
+ }
+
+ static void ip_cmsg_recv_dstaddr(struct msghdr *msg, struct sk_buff *skb)
+diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
+index 67b0f3cfc5c7..40cbb00432d4 100644
+--- a/net/netfilter/nf_conntrack_netlink.c
++++ b/net/netfilter/nf_conntrack_netlink.c
+@@ -342,6 +342,7 @@ static int ctnetlink_dump_secctx(struct sk_buff *skb, const struct nf_conn *ct)
+ int len, ret;
+ char *secctx;
+ struct lsmblob blob;
++ struct lsmcontext context;
+
+ /* lsmblob_init() puts ct->secmark into all of the secids in blob.
+ * security_secid_to_secctx() will know which security module
+@@ -362,7 +363,8 @@ static int ctnetlink_dump_secctx(struct sk_buff *skb, const struct nf_conn *ct)
+
+ ret = 0;
+ nla_put_failure:
+- security_release_secctx(secctx, len);
++ lsmcontext_init(&context, secctx, len, 0); /* scaffolding */
++ security_release_secctx(&context);
+ return ret;
+ }
+ #else
+diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
+index 79c280d1efce..3fcf44342b14 100644
+--- a/net/netfilter/nf_conntrack_standalone.c
++++ b/net/netfilter/nf_conntrack_standalone.c
+@@ -179,6 +179,7 @@ static void ct_show_secctx(struct seq_file *s, const struct nf_conn *ct)
+ u32 len;
+ char *secctx;
+ struct lsmblob blob;
++ struct lsmcontext context;
+
+ lsmblob_init(&blob, ct->secmark);
+ ret = security_secid_to_secctx(&blob, &secctx, &len);
+@@ -187,7 +188,8 @@ static void ct_show_secctx(struct seq_file *s, const struct nf_conn *ct)
+
+ seq_printf(s, "secctx=%s ", secctx);
+
+- security_release_secctx(secctx, len);
++ lsmcontext_init(&context, secctx, len, 0); /* scaffolding */
++ security_release_secctx(&context);
+ }
+ #else
+ static inline void ct_show_secctx(struct seq_file *s, const struct nf_conn *ct)
+diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
+index 62c0c5b847c6..5961a9b17f66 100644
+--- a/net/netfilter/nfnetlink_queue.c
++++ b/net/netfilter/nfnetlink_queue.c
+@@ -397,6 +397,7 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue,
+ enum ip_conntrack_info ctinfo;
+ struct nfnl_ct_hook *nfnl_ct;
+ bool csum_verify;
++ struct lsmcontext scaff; /* scaffolding */
+ char *secdata = NULL;
+ u32 seclen = 0;
+
+@@ -626,8 +627,10 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue,
+ }
+
+ nlh->nlmsg_len = skb->len;
+- if (seclen)
+- security_release_secctx(secdata, seclen);
++ if (seclen) {
++ lsmcontext_init(&scaff, secdata, seclen, 0);
++ security_release_secctx(&scaff);
++ }
+ return skb;
+
+ nla_put_failure:
+@@ -635,8 +638,10 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue,
+ kfree_skb(skb);
+ net_err_ratelimited("nf_queue: error creating packet message\n");
+ nlmsg_failure:
+- if (seclen)
+- security_release_secctx(secdata, seclen);
++ if (seclen) {
++ lsmcontext_init(&scaff, secdata, seclen, 0);
++ security_release_secctx(&scaff);
++ }
+ return NULL;
+ }
+
+diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c
+index 15b53fc4e83f..7cb6f27c8cb2 100644
+--- a/net/netlabel/netlabel_unlabeled.c
++++ b/net/netlabel/netlabel_unlabeled.c
+@@ -374,6 +374,7 @@ int netlbl_unlhsh_add(struct net *net,
+ struct net_device *dev;
+ struct netlbl_unlhsh_iface *iface;
+ struct audit_buffer *audit_buf = NULL;
++ struct lsmcontext context;
+ char *secctx = NULL;
+ u32 secctx_len;
+ struct lsmblob blob;
+@@ -447,7 +448,9 @@ int netlbl_unlhsh_add(struct net *net,
+ &secctx,
+ &secctx_len) == 0) {
+ audit_log_format(audit_buf, " sec_obj=%s", secctx);
+- security_release_secctx(secctx, secctx_len);
++ /* scaffolding */
++ lsmcontext_init(&context, secctx, secctx_len, 0);
++ security_release_secctx(&context);
+ }
+ audit_log_format(audit_buf, " res=%u", ret_val == 0 ? 1 : 0);
+ audit_log_end(audit_buf);
+@@ -478,6 +481,7 @@ static int netlbl_unlhsh_remove_addr4(struct net *net,
+ struct netlbl_unlhsh_addr4 *entry;
+ struct audit_buffer *audit_buf;
+ struct net_device *dev;
++ struct lsmcontext context;
+ char *secctx;
+ u32 secctx_len;
+ struct lsmblob blob;
+@@ -508,7 +512,9 @@ static int netlbl_unlhsh_remove_addr4(struct net *net,
+ security_secid_to_secctx(&blob,
+ &secctx, &secctx_len) == 0) {
+ audit_log_format(audit_buf, " sec_obj=%s", secctx);
+- security_release_secctx(secctx, secctx_len);
++ /* scaffolding */
++ lsmcontext_init(&context, secctx, secctx_len, 0);
++ security_release_secctx(&context);
+ }
+ audit_log_format(audit_buf, " res=%u", entry != NULL ? 1 : 0);
+ audit_log_end(audit_buf);
+@@ -545,6 +551,7 @@ static int netlbl_unlhsh_remove_addr6(struct net *net,
+ struct netlbl_unlhsh_addr6 *entry;
+ struct audit_buffer *audit_buf;
+ struct net_device *dev;
++ struct lsmcontext context;
+ char *secctx;
+ u32 secctx_len;
+ struct lsmblob blob;
+@@ -574,7 +581,8 @@ static int netlbl_unlhsh_remove_addr6(struct net *net,
+ security_secid_to_secctx(&blob,
+ &secctx, &secctx_len) == 0) {
+ audit_log_format(audit_buf, " sec_obj=%s", secctx);
+- security_release_secctx(secctx, secctx_len);
++ lsmcontext_init(&context, secctx, secctx_len, 0);
++ security_release_secctx(&context);
+ }
+ audit_log_format(audit_buf, " res=%u", entry != NULL ? 1 : 0);
+ audit_log_end(audit_buf);
+@@ -1093,6 +1101,7 @@ static int netlbl_unlabel_staticlist_gen(u32 cmd,
+ int ret_val = -ENOMEM;
+ struct netlbl_unlhsh_walk_arg *cb_arg = arg;
+ struct net_device *dev;
++ struct lsmcontext context;
+ void *data;
+ u32 secid;
+ char *secctx;
+@@ -1163,7 +1172,9 @@ static int netlbl_unlabel_staticlist_gen(u32 cmd,
+ NLBL_UNLABEL_A_SECCTX,
+ secctx_len,
+ secctx);
+- security_release_secctx(secctx, secctx_len);
++ /* scaffolding */
++ lsmcontext_init(&context, secctx, secctx_len, 0);
++ security_release_secctx(&context);
+ if (ret_val != 0)
+ goto list_cb_failure;
+
+diff --git a/net/netlabel/netlabel_user.c b/net/netlabel/netlabel_user.c
+index 893301ae0131..ef139d8ae7cd 100644
+--- a/net/netlabel/netlabel_user.c
++++ b/net/netlabel/netlabel_user.c
+@@ -84,6 +84,7 @@ struct audit_buffer *netlbl_audit_start_common(int type,
+ struct netlbl_audit *audit_info)
+ {
+ struct audit_buffer *audit_buf;
++ struct lsmcontext context;
+ char *secctx;
+ u32 secctx_len;
+ struct lsmblob blob;
+@@ -103,7 +104,8 @@ struct audit_buffer *netlbl_audit_start_common(int type,
+ if (audit_info->secid != 0 &&
+ security_secid_to_secctx(&blob, &secctx, &secctx_len) == 0) {
+ audit_log_format(audit_buf, " subj=%s", secctx);
+- security_release_secctx(secctx, secctx_len);
++ lsmcontext_init(&context, secctx, secctx_len, 0);/*scaffolding*/
++ security_release_secctx(&context);
+ }
+
+ return audit_buf;
diff --git a/security/security.c b/security/security.c
-index aa8e1c73a062..92c5aa427b53 100644
+index 1d734d9579f1..d14717fe0cb7 100644
--- a/security/security.c
+++ b/security/security.c
-@@ -46,7 +46,9 @@ static struct kmem_cache *lsm_file_cache;
- static struct kmem_cache *lsm_inode_cache;
-
- char *lsm_names;
--static struct lsm_blob_sizes blob_sizes __lsm_ro_after_init;
-+static struct lsm_blob_sizes blob_sizes __lsm_ro_after_init = {
-+ .lbs_task = sizeof(int), /* slot number for the "display" LSM */
-+};
-
- /* Boot-time LSM user choice */
- static __initdata const char *chosen_lsm_order;
-@@ -583,6 +585,8 @@ int lsm_inode_alloc(struct inode *inode)
- */
- static int lsm_task_alloc(struct task_struct *task)
- {
-+ int *display;
+@@ -2363,16 +2363,17 @@ int security_secctx_to_secid(const char *secdata, u32 seclen,
+ }
+ EXPORT_SYMBOL(security_secctx_to_secid);
+
+-void security_release_secctx(char *secdata, u32 seclen)
++void security_release_secctx(struct lsmcontext *cp)
+ {
+ struct security_hook_list *hp;
+- int ilsm = lsm_task_ilsm(current);
+
+ hlist_for_each_entry(hp, &security_hook_heads.release_secctx, list)
+- if (ilsm == LSMBLOB_INVALID || ilsm == hp->lsmid->slot) {
+- hp->hook.release_secctx(secdata, seclen);
+- return;
++ if (cp->slot == hp->lsmid->slot) {
++ hp->hook.release_secctx(cp->context, cp->len);
++ break;
+ }
+
- if (blob_sizes.lbs_task == 0) {
- task->security = NULL;
- return 0;
-@@ -591,6 +595,15 @@ static int lsm_task_alloc(struct task_struct *task)
- task->security = kzalloc(blob_sizes.lbs_task, GFP_KERNEL);
- if (task->security == NULL)
- return -ENOMEM;
-+
-+ /*
-+ * The start of the task blob contains the "display" LSM slot number.
-+ * Start with it set to the invalid slot number, indicating that the
-+ * default first registered LSM be displayed.
-+ */
-+ display = task->security;
-+ *display = LSMBLOB_INVALID;
-+
- return 0;
- }
-
-@@ -1579,14 +1592,24 @@ int security_file_open(struct file *file)
-
- int security_task_alloc(struct task_struct *task, unsigned long clone_flags)
- {
-+ int *odisplay = current->security;
-+ int *ndisplay;
- int rc = lsm_task_alloc(task);
-
-- if (rc)
-+ if (unlikely(rc))
- return rc;
-+
- rc = call_int_hook(task_alloc, 0, task, clone_flags);
-- if (unlikely(rc))
-+ if (unlikely(rc)) {
- security_task_free(task);
-- return rc;
-+ return rc;
-+ }
-+
-+ ndisplay = task->security;
-+ if (ndisplay && odisplay)
-+ *ndisplay = *odisplay;
-+
-+ return 0;
- }
-
- void security_task_free(struct task_struct *task)
-@@ -1972,10 +1995,28 @@ int security_getprocattr(struct task_struct *p, const char *lsm, char *name,
- char **value)
- {
- struct security_hook_list *hp;
-+ int *display = current->security;
-+
-+ if (!strcmp(name, "display")) {
-+ hlist_for_each_entry(hp, &security_hook_heads.secid_to_secctx,
-+ list) {
-+ if (*display == LSMBLOB_INVALID ||
-+ hp->slot == *display) {
-+ *value = kstrdup(hp->lsm, GFP_KERNEL);
-+ if (*value)
-+ return strlen(hp->lsm);
-+ return -ENOMEM;
-+ }
-+ }
-+ return -EINVAL;
-+ }
-
- hlist_for_each_entry(hp, &security_hook_heads.getprocattr, list) {
- if (lsm != NULL && strcmp(lsm, hp->lsm))
- continue;
-+ if (lsm == NULL && *display != LSMBLOB_INVALID &&
-+ *display != hp->slot)
-+ continue;
- return hp->hook.getprocattr(p, name, value);
- }
- return -EINVAL;
-@@ -1985,10 +2026,27 @@ int security_setprocattr(const char *lsm, const char *name, void *value,
- size_t size)
- {
- struct security_hook_list *hp;
-+ int *display = current->security;
-+ int len;
-+
-+ if (!strcmp(name, "display")) {
-+ hlist_for_each_entry(hp, &security_hook_heads.secid_to_secctx,
-+ list) {
-+ len = strlen(hp->lsm);
-+ if (size >= len && !strncmp(value, hp->lsm, len)) {
-+ *display = hp->slot;
-+ return size;
-+ }
-+ }
-+ return -EINVAL;
-+ }
-
- hlist_for_each_entry(hp, &security_hook_heads.setprocattr, list) {
- if (lsm != NULL && strcmp(lsm, hp->lsm))
- continue;
-+ if (lsm == NULL && *display != LSMBLOB_INVALID &&
-+ *display != hp->slot)
-+ continue;
- return hp->hook.setprocattr(name, value, size);
- }
- return -EINVAL;
-@@ -2008,14 +2066,12 @@ EXPORT_SYMBOL(security_ismaclabel);
- int security_secid_to_secctx(struct lsmblob *blob, char **secdata, u32 *seclen)
- {
- struct security_hook_list *hp;
-- int rc;
-+ int *display = current->security;
-
-- hlist_for_each_entry(hp, &security_hook_heads.secid_to_secctx, list) {
-- rc = hp->hook.secid_to_secctx(blob->secid[hp->slot],
-- secdata, seclen);
-- if (rc != 0)
-- return rc;
-- }
-+ hlist_for_each_entry(hp, &security_hook_heads.secid_to_secctx, list)
-+ if (*display == LSMBLOB_INVALID || *display == hp->slot)
-+ return hp->hook.secid_to_secctx(blob->secid[hp->slot],
-+ secdata, seclen);
- return 0;
- }
- EXPORT_SYMBOL(security_secid_to_secctx);
-@@ -2024,22 +2080,27 @@ int security_secctx_to_secid(const char *secdata, u32 seclen,
- struct lsmblob *blob)
- {
- struct security_hook_list *hp;
-- int rc;
-+ int *display = current->security;
-
- lsmblob_init(blob, 0);
-- hlist_for_each_entry(hp, &security_hook_heads.secctx_to_secid, list) {
-- rc = hp->hook.secctx_to_secid(secdata, seclen,
-- &blob->secid[hp->slot]);
-- if (rc != 0)
-- return rc;
-- }
-+ hlist_for_each_entry(hp, &security_hook_heads.secctx_to_secid, list)
-+ if (*display == LSMBLOB_INVALID || *display == hp->slot)
-+ return hp->hook.secctx_to_secid(secdata, seclen,
-+ &blob->secid[hp->slot]);
- return 0;
- }
- EXPORT_SYMBOL(security_secctx_to_secid);
-
- void security_release_secctx(char *secdata, u32 seclen)
- {
-- call_void_hook(release_secctx, secdata, seclen);
-+ struct security_hook_list *hp;
-+ int *display = current->security;
-+
-+ hlist_for_each_entry(hp, &security_hook_heads.release_secctx, list)
-+ if (*display == LSMBLOB_INVALID || *display == hp->slot) {
-+ hp->hook.release_secctx(secdata, seclen);
-+ return;
-+ }
++ memset(cp, 0, sizeof(*cp));
}
EXPORT_SYMBOL(security_release_secctx);
-@@ -2164,8 +2225,15 @@ EXPORT_SYMBOL(security_sock_rcv_skb);
- int security_socket_getpeersec_stream(struct socket *sock, char __user *optval,
- int __user *optlen, unsigned len)
- {
-- return call_int_hook(socket_getpeersec_stream, -ENOPROTOOPT, sock,
-- optval, optlen, len);
-+ int *display = current->security;
-+ struct security_hook_list *hp;
-+
-+ hlist_for_each_entry(hp, &security_hook_heads.socket_getpeersec_stream,
-+ list)
-+ if (*display == LSMBLOB_INVALID || *display == hp->slot)
-+ return hp->hook.socket_getpeersec_stream(sock, optval,
-+ optlen, len);
-+ return -ENOPROTOOPT;
- }
-
- int security_socket_getpeersec_dgram(struct socket *sock, struct sk_buff *skb,
--
-2.20.1
+2.31.1