--- v13
+++ v38
@@ -1,521 +1,326 @@
-Netlabel uses LSM interfaces requiring an lsmblob and
-the internal storage is used to pass information between
-these interfaces, so change the internal data from a secid
-to a lsmblob. Update the netlabel interfaces and their
-callers to accommodate the change. This requires that the
-modules using netlabel use the lsm_id.slot to access the
-correct secid when using netlabel.
+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
---
- include/net/netlabel.h | 8 ++--
- net/ipv4/cipso_ipv4.c | 23 +++++++-----
- net/netlabel/netlabel_kapi.c | 6 +--
- net/netlabel/netlabel_unlabeled.c | 57 +++++++++++------------------
- net/netlabel/netlabel_unlabeled.h | 2 +-
- security/selinux/hooks.c | 2 +-
- security/selinux/include/security.h | 1 +
- security/selinux/netlabel.c | 2 +-
- security/selinux/ss/services.c | 4 +-
- security/smack/smack.h | 1 +
- security/smack/smack_lsm.c | 5 ++-
- security/smack/smackfs.c | 10 +++--
- 12 files changed, 59 insertions(+), 62 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/include/net/netlabel.h b/include/net/netlabel.h
-index 43ae50337685..73fc25b4042b 100644
---- a/include/net/netlabel.h
-+++ b/include/net/netlabel.h
-@@ -166,7 +166,7 @@ struct netlbl_lsm_catmap {
- * @attr.mls: MLS sensitivity label
- * @attr.mls.cat: MLS category bitmap
- * @attr.mls.lvl: MLS sensitivity level
-- * @attr.secid: LSM specific secid token
-+ * @attr.lsmblob: LSM specific data
- *
- * Description:
- * This structure is used to pass security attributes between NetLabel and the
-@@ -201,7 +201,7 @@ struct netlbl_lsm_secattr {
- struct netlbl_lsm_catmap *cat;
- u32 lvl;
- } mls;
+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;
-+ struct lsmblob lsmblob;
- } attr;
+
+- 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 ca5dcaee7c23..9f80b685542d 100644
+--- a/include/linux/security.h
++++ b/include/linux/security.h
+@@ -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;
};
-
-@@ -415,7 +415,7 @@ int netlbl_cfg_unlbl_static_add(struct net *net,
- const void *addr,
- const void *mask,
- u16 family,
-- u32 secid,
-+ struct lsmblob *lsmblob,
- struct netlbl_audit *audit_info);
- int netlbl_cfg_unlbl_static_del(struct net *net,
- const char *dev_name,
-@@ -523,7 +523,7 @@ static inline int netlbl_cfg_unlbl_static_add(struct net *net,
- const void *addr,
- const void *mask,
- u16 family,
-- u32 secid,
-+ struct lsmblob *lsmblob,
- struct netlbl_audit *audit_info)
- {
- return -ENOSYS;
-diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c
-index 376882215919..adb9dffc3952 100644
---- a/net/ipv4/cipso_ipv4.c
-+++ b/net/ipv4/cipso_ipv4.c
-@@ -106,15 +106,17 @@ int cipso_v4_rbm_strictvalid = 1;
- /* Base length of the local tag (non-standard tag).
- * Tag definition (may change between kernel versions)
- *
-- * 0 8 16 24 32
-- * +----------+----------+----------+----------+
-- * | 10000000 | 00000110 | 32-bit secid value |
-- * +----------+----------+----------+----------+
-- * | in (host byte order)|
-- * +----------+----------+
-- *
-+ * 0 8 16 16 + sizeof(struct lsmblob)
-+ * +----------+----------+---------------------+
-+ * | 10000000 | 00000110 | LSM blob data |
-+ * +----------+----------+---------------------+
-+ *
-+ * All secid and flag fields are in host byte order.
-+ * The lsmblob structure size varies depending on which
-+ * Linux security modules are built in the kernel.
-+ * The data is opaque.
- */
--#define CIPSO_V4_TAG_LOC_BLEN 6
-+#define CIPSO_V4_TAG_LOC_BLEN (2 + sizeof(struct lsmblob))
-
- /*
- * Helper Functions
-@@ -1467,7 +1469,8 @@ static int cipso_v4_gentag_loc(const struct cipso_v4_doi *doi_def,
-
- buffer[0] = CIPSO_V4_TAG_LOCAL;
- buffer[1] = CIPSO_V4_TAG_LOC_BLEN;
-- *(u32 *)&buffer[2] = secattr->attr.secid;
-+ memcpy(&buffer[2], &secattr->attr.lsmblob,
-+ sizeof(secattr->attr.lsmblob));
-
- return CIPSO_V4_TAG_LOC_BLEN;
- }
-@@ -1487,7 +1490,7 @@ static int cipso_v4_parsetag_loc(const struct cipso_v4_doi *doi_def,
- const unsigned char *tag,
- struct netlbl_lsm_secattr *secattr)
- {
-- secattr->attr.secid = *(u32 *)&tag[2];
-+ memcpy(&secattr->attr.lsmblob, &tag[2], sizeof(secattr->attr.lsmblob));
- secattr->flags |= NETLBL_SECATTR_SECID;
-
- return 0;
-diff --git a/net/netlabel/netlabel_kapi.c b/net/netlabel/netlabel_kapi.c
-index 409a3ae47ce2..f2ebd43a7992 100644
---- a/net/netlabel/netlabel_kapi.c
-+++ b/net/netlabel/netlabel_kapi.c
-@@ -196,7 +196,7 @@ int netlbl_cfg_unlbl_map_add(const char *domain,
- * @addr: IP address in network byte order (struct in[6]_addr)
- * @mask: address mask in network byte order (struct in[6]_addr)
- * @family: address family
-- * @secid: LSM secid value for the entry
-+ * @lsmblob: LSM data value for the entry
- * @audit_info: NetLabel audit information
- *
- * Description:
-@@ -210,7 +210,7 @@ int netlbl_cfg_unlbl_static_add(struct net *net,
- const void *addr,
- const void *mask,
- u16 family,
-- u32 secid,
-+ struct lsmblob *lsmblob,
- struct netlbl_audit *audit_info)
- {
- u32 addr_len;
-@@ -230,7 +230,7 @@ int netlbl_cfg_unlbl_static_add(struct net *net,
-
- return netlbl_unlhsh_add(net,
- dev_name, addr, mask, addr_len,
-- secid, audit_info);
-+ lsmblob, audit_info);
- }
-
- /**
-diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c
-index c03fe9a4f7b9..3b0f07b59436 100644
---- a/net/netlabel/netlabel_unlabeled.c
-+++ b/net/netlabel/netlabel_unlabeled.c
-@@ -66,7 +66,7 @@ struct netlbl_unlhsh_tbl {
- #define netlbl_unlhsh_addr4_entry(iter) \
- container_of(iter, struct netlbl_unlhsh_addr4, list)
- struct netlbl_unlhsh_addr4 {
+@@ -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 lsmblob;
-
- struct netlbl_af4list list;
- struct rcu_head rcu;
-@@ -74,7 +74,7 @@ struct netlbl_unlhsh_addr4 {
- #define netlbl_unlhsh_addr6_entry(iter) \
- container_of(iter, struct netlbl_unlhsh_addr6, list)
- struct netlbl_unlhsh_addr6 {
-- u32 secid;
-+ struct lsmblob lsmblob;
-
- struct netlbl_af6list list;
- struct rcu_head rcu;
-@@ -219,7 +219,7 @@ static struct netlbl_unlhsh_iface *netlbl_unlhsh_search_iface(int ifindex)
- * @iface: the associated interface entry
- * @addr: IPv4 address in network byte order
- * @mask: IPv4 address mask in network byte order
-- * @secid: LSM secid value for entry
-+ * @lsmblob: LSM data value for entry
- *
- * Description:
- * Add a new address entry into the unlabeled connection hash table using the
-@@ -230,7 +230,7 @@ static struct netlbl_unlhsh_iface *netlbl_unlhsh_search_iface(int ifindex)
- static int netlbl_unlhsh_add_addr4(struct netlbl_unlhsh_iface *iface,
- const struct in_addr *addr,
- const struct in_addr *mask,
-- u32 secid)
-+ struct lsmblob *lsmblob)
- {
- int ret_val;
- struct netlbl_unlhsh_addr4 *entry;
-@@ -242,7 +242,7 @@ static int netlbl_unlhsh_add_addr4(struct netlbl_unlhsh_iface *iface,
- entry->list.addr = addr->s_addr & mask->s_addr;
- entry->list.mask = mask->s_addr;
- entry->list.valid = 1;
-- entry->secid = secid;
-+ entry->lsmblob = *lsmblob;
-
- spin_lock(&netlbl_unlhsh_lock);
- ret_val = netlbl_af4list_add(&entry->list, &iface->addr4_list);
-@@ -259,7 +259,7 @@ static int netlbl_unlhsh_add_addr4(struct netlbl_unlhsh_iface *iface,
- * @iface: the associated interface entry
- * @addr: IPv6 address in network byte order
- * @mask: IPv6 address mask in network byte order
-- * @secid: LSM secid value for entry
-+ * @lsmblob: LSM data value for entry
- *
- * Description:
- * Add a new address entry into the unlabeled connection hash table using the
-@@ -270,7 +270,7 @@ static int netlbl_unlhsh_add_addr4(struct netlbl_unlhsh_iface *iface,
- static int netlbl_unlhsh_add_addr6(struct netlbl_unlhsh_iface *iface,
- const struct in6_addr *addr,
- const struct in6_addr *mask,
-- u32 secid)
-+ struct lsmblob *lsmblob)
- {
- int ret_val;
- struct netlbl_unlhsh_addr6 *entry;
-@@ -286,7 +286,7 @@ static int netlbl_unlhsh_add_addr6(struct netlbl_unlhsh_iface *iface,
- entry->list.addr.s6_addr32[3] &= mask->s6_addr32[3];
- entry->list.mask = *mask;
- entry->list.valid = 1;
-- entry->secid = secid;
-+ entry->lsmblob = *lsmblob;
-
- spin_lock(&netlbl_unlhsh_lock);
- ret_val = netlbl_af6list_add(&entry->list, &iface->addr6_list);
-@@ -365,7 +365,7 @@ int netlbl_unlhsh_add(struct net *net,
- const void *addr,
- const void *mask,
- u32 addr_len,
-- u32 secid,
-+ struct lsmblob *lsmblob,
- struct netlbl_audit *audit_info)
- {
- int ret_val;
-@@ -374,7 +374,6 @@ int netlbl_unlhsh_add(struct net *net,
- struct netlbl_unlhsh_iface *iface;
- struct audit_buffer *audit_buf = NULL;
- struct lsmcontext context;
-- struct lsmblob blob;
-
- if (addr_len != sizeof(struct in_addr) &&
- addr_len != sizeof(struct in6_addr))
-@@ -407,7 +406,7 @@ int netlbl_unlhsh_add(struct net *net,
- const struct in_addr *addr4 = addr;
- const struct in_addr *mask4 = mask;
-
-- ret_val = netlbl_unlhsh_add_addr4(iface, addr4, mask4, secid);
-+ ret_val = netlbl_unlhsh_add_addr4(iface, addr4, mask4, lsmblob);
- if (audit_buf != NULL)
- netlbl_af4list_audit_addr(audit_buf, 1,
- dev_name,
-@@ -420,7 +419,7 @@ int netlbl_unlhsh_add(struct net *net,
- const struct in6_addr *addr6 = addr;
- const struct in6_addr *mask6 = mask;
-
-- ret_val = netlbl_unlhsh_add_addr6(iface, addr6, mask6, secid);
-+ ret_val = netlbl_unlhsh_add_addr6(iface, addr6, mask6, lsmblob);
- if (audit_buf != NULL)
- netlbl_af6list_audit_addr(audit_buf, 1,
- dev_name,
-@@ -437,8 +436,7 @@ int netlbl_unlhsh_add(struct net *net,
- unlhsh_add_return:
- rcu_read_unlock();
- if (audit_buf != NULL) {
-- lsmblob_init(&blob, secid);
-- if (security_secid_to_secctx(&blob, &context) == 0) {
-+ if (security_secid_to_secctx(lsmblob, &context) == 0) {
- audit_log_format(audit_buf, " sec_obj=%s",
- context.context);
- security_release_secctx(&context);
-@@ -473,7 +471,6 @@ static int netlbl_unlhsh_remove_addr4(struct net *net,
- struct audit_buffer *audit_buf;
- struct net_device *dev;
- struct lsmcontext context;
-- struct lsmblob blob;
-
- spin_lock(&netlbl_unlhsh_lock);
- list_entry = netlbl_af4list_remove(addr->s_addr, mask->s_addr,
-@@ -493,10 +490,8 @@ static int netlbl_unlhsh_remove_addr4(struct net *net,
- addr->s_addr, mask->s_addr);
- if (dev != NULL)
- dev_put(dev);
-- if (entry != NULL)
-- lsmblob_init(&blob, entry->secid);
- if (entry != NULL &&
-- security_secid_to_secctx(&blob, &context) == 0) {
-+ security_secid_to_secctx(&entry->lsmblob, &context) == 0) {
- audit_log_format(audit_buf, " sec_obj=%s",
- context.context);
- security_release_secctx(&context);
-@@ -537,7 +532,6 @@ static int netlbl_unlhsh_remove_addr6(struct net *net,
- struct audit_buffer *audit_buf;
- struct net_device *dev;
- struct lsmcontext context;
-- struct lsmblob blob;
-
- spin_lock(&netlbl_unlhsh_lock);
- list_entry = netlbl_af6list_remove(addr, mask, &iface->addr6_list);
-@@ -556,10 +550,8 @@ static int netlbl_unlhsh_remove_addr6(struct net *net,
- addr, mask);
- if (dev != NULL)
- dev_put(dev);
-- if (entry != NULL)
-- lsmblob_init(&blob, entry->secid);
- if (entry != NULL &&
-- security_secid_to_secctx(&blob, &context) == 0) {
-+ security_secid_to_secctx(&entry->lsmblob, &context) == 0) {
- audit_log_format(audit_buf, " sec_obj=%s",
- context.context);
- security_release_secctx(&context);
-@@ -913,9 +905,8 @@ static int netlbl_unlabel_staticadd(struct sk_buff *skb,
- if (ret_val != 0)
- return ret_val;
-
-- /* scaffolding with the [0] */
- return netlbl_unlhsh_add(&init_net,
-- dev_name, addr, mask, addr_len, blob.secid[0],
-+ dev_name, addr, mask, addr_len, &blob,
- &audit_info);
- }
-
-@@ -963,10 +954,8 @@ static int netlbl_unlabel_staticadddef(struct sk_buff *skb,
- if (ret_val != 0)
- return ret_val;
-
-- /* scaffolding with the [0] */
- return netlbl_unlhsh_add(&init_net,
-- NULL, addr, mask, addr_len, blob.secid[0],
-- &audit_info);
-+ NULL, addr, mask, addr_len, &blob, &audit_info);
- }
-
- /**
-@@ -1078,8 +1067,7 @@ static int netlbl_unlabel_staticlist_gen(u32 cmd,
- struct net_device *dev;
- struct lsmcontext context;
- void *data;
-- u32 secid;
-- struct lsmblob blob;
-+ struct lsmblob *lsmb;
-
- data = genlmsg_put(cb_arg->skb, NETLINK_CB(cb_arg->nl_cb->skb).portid,
- cb_arg->seq, &netlbl_unlabel_gnl_family,
-@@ -1117,7 +1105,7 @@ static int netlbl_unlabel_staticlist_gen(u32 cmd,
- if (ret_val != 0)
- goto list_cb_failure;
-
-- secid = addr4->secid;
-+ lsmb = (struct lsmblob *)&addr4->lsmblob;
- } else {
- ret_val = nla_put_in6_addr(cb_arg->skb,
- NLBL_UNLABEL_A_IPV6ADDR,
-@@ -1131,11 +1119,10 @@ static int netlbl_unlabel_staticlist_gen(u32 cmd,
- if (ret_val != 0)
- goto list_cb_failure;
-
-- secid = addr6->secid;
-+ lsmb = (struct lsmblob *)&addr6->lsmblob;
- }
-
+ 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);
-- ret_val = security_secid_to_secctx(&blob, &context);
-+ ret_val = security_secid_to_secctx(lsmb, &context);
- if (ret_val != 0)
- goto list_cb_failure;
- ret_val = nla_put(cb_arg->skb,
-@@ -1487,7 +1474,7 @@ int netlbl_unlabel_getattr(const struct sk_buff *skb,
- &iface->addr4_list);
- if (addr4 == NULL)
- goto unlabel_getattr_nolabel;
-- secattr->attr.secid = netlbl_unlhsh_addr4_entry(addr4)->secid;
-+ secattr->attr.lsmblob = netlbl_unlhsh_addr4_entry(addr4)->lsmblob;
- break;
- }
- #if IS_ENABLED(CONFIG_IPV6)
-@@ -1500,7 +1487,7 @@ int netlbl_unlabel_getattr(const struct sk_buff *skb,
- &iface->addr6_list);
- if (addr6 == NULL)
- goto unlabel_getattr_nolabel;
-- secattr->attr.secid = netlbl_unlhsh_addr6_entry(addr6)->secid;
-+ secattr->attr.lsmblob = netlbl_unlhsh_addr6_entry(addr6)->lsmblob;
- break;
- }
- #endif /* IPv6 */
-diff --git a/net/netlabel/netlabel_unlabeled.h b/net/netlabel/netlabel_unlabeled.h
-index 058e3a285d56..168920780994 100644
---- a/net/netlabel/netlabel_unlabeled.h
-+++ b/net/netlabel/netlabel_unlabeled.h
-@@ -211,7 +211,7 @@ int netlbl_unlhsh_add(struct net *net,
- const void *addr,
- const void *mask,
- u32 addr_len,
-- u32 secid,
-+ struct lsmblob *lsmblob,
- struct netlbl_audit *audit_info);
- int netlbl_unlhsh_remove(struct net *net,
- const char *dev_name,
-diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
-index b8501ca3c8f3..cd4743331800 100644
---- a/security/selinux/hooks.c
-+++ b/security/selinux/hooks.c
-@@ -6871,7 +6871,7 @@ static int selinux_perf_event_write(struct perf_event *event)
- }
- #endif
-
--static struct lsm_id selinux_lsmid __lsm_ro_after_init = {
-+struct lsm_id selinux_lsmid __lsm_ro_after_init = {
- .lsm = "selinux",
- .slot = LSMBLOB_NEEDED
- };
-diff --git a/security/selinux/include/security.h b/security/selinux/include/security.h
-index ae840634e3c7..741ba0e6dd83 100644
---- a/security/selinux/include/security.h
-+++ b/security/selinux/include/security.h
-@@ -70,6 +70,7 @@
- struct netlbl_lsm_secattr;
-
- extern int selinux_enabled;
-+extern struct lsm_id selinux_lsmid;
-
- /* Policy capabilities */
- enum {
-diff --git a/security/selinux/netlabel.c b/security/selinux/netlabel.c
-index 6a94b31b5472..d8d7603ab14e 100644
---- a/security/selinux/netlabel.c
-+++ b/security/selinux/netlabel.c
-@@ -108,7 +108,7 @@ static struct netlbl_lsm_secattr *selinux_netlbl_sock_getattr(
- return NULL;
-
- if ((secattr->flags & NETLBL_SECATTR_SECID) &&
-- (secattr->attr.secid == sid))
-+ (secattr->attr.lsmblob.secid[selinux_lsmid.slot] == sid))
- return secattr;
-
- return NULL;
-diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
-index a5813c7629c1..2b7680903b6b 100644
---- a/security/selinux/ss/services.c
-+++ b/security/selinux/ss/services.c
-@@ -3599,7 +3599,7 @@ int security_netlbl_secattr_to_sid(struct selinux_state *state,
- if (secattr->flags & NETLBL_SECATTR_CACHE)
- *sid = *(u32 *)secattr->cache->data;
- else if (secattr->flags & NETLBL_SECATTR_SECID)
-- *sid = secattr->attr.secid;
-+ *sid = secattr->attr.lsmblob.secid[selinux_lsmid.slot];
- else if (secattr->flags & NETLBL_SECATTR_MLS_LVL) {
- rc = -EIDRM;
- ctx = sidtab_search(sidtab, SECINITSID_NETMSG);
-@@ -3672,7 +3672,7 @@ int security_netlbl_sid_to_secattr(struct selinux_state *state,
- if (secattr->domain == NULL)
- goto out;
-
-- secattr->attr.secid = sid;
-+ secattr->attr.lsmblob.secid[selinux_lsmid.slot] = sid;
- secattr->flags |= NETLBL_SECATTR_DOMAIN_CPY | NETLBL_SECATTR_SECID;
- mls_export_netlbl_lvl(policydb, ctx, secattr);
- rc = mls_export_netlbl_cat(policydb, ctx, secattr);
-diff --git a/security/smack/smack.h b/security/smack/smack.h
-index 2836540f9577..6e76b6b33063 100644
---- a/security/smack/smack.h
-+++ b/security/smack/smack.h
-@@ -316,6 +316,7 @@ void smk_destroy_label_list(struct list_head *list);
- * Shared data.
- */
- extern int smack_enabled;
-+extern struct lsm_id smack_lsmid;
- extern int smack_cipso_direct;
- extern int smack_cipso_mapped;
- extern struct smack_known *smack_net_ambient;
-diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
-index 9737ead06b39..9ce67e03ac49 100644
---- a/security/smack/smack_lsm.c
-+++ b/security/smack/smack_lsm.c
-@@ -3775,7 +3775,8 @@ static struct smack_known *smack_from_secattr(struct netlbl_lsm_secattr *sap,
- /*
- * Looks like a fallback, which gives us a secid.
- */
-- return smack_from_secid(sap->attr.secid);
-+ return smack_from_secid(
-+ sap->attr.lsmblob.secid[smack_lsmid.slot]);
- /*
- * Without guidance regarding the smack value
- * for the packet fall back on the network
-@@ -4592,7 +4593,7 @@ struct lsm_blob_sizes smack_blob_sizes __lsm_ro_after_init = {
- .lbs_sock = sizeof(struct socket_smack),
- };
-
--static struct lsm_id smack_lsmid __lsm_ro_after_init = {
-+struct lsm_id smack_lsmid __lsm_ro_after_init = {
- .lsm = "smack",
- .slot = LSMBLOB_NEEDED
- };
-diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c
-index e3e05c04dbd1..d10e9c96717e 100644
---- a/security/smack/smackfs.c
-+++ b/security/smack/smackfs.c
-@@ -1122,6 +1122,7 @@ static void smk_net4addr_insert(struct smk_net4addr *new)
- static ssize_t smk_write_net4addr(struct file *file, const char __user *buf,
- size_t count, loff_t *ppos)
- {
-+ struct lsmblob lsmblob;
- struct smk_net4addr *snp;
- struct sockaddr_in newname;
- char *smack;
-@@ -1253,10 +1254,13 @@ static ssize_t smk_write_net4addr(struct file *file, const char __user *buf,
- * this host so that incoming packets get labeled.
- * but only if we didn't get the special CIPSO option
- */
-- if (rc == 0 && skp != NULL)
-+ if (rc == 0 && skp != NULL) {
-+ lsmblob_init(&lsmblob, 0);
-+ lsmblob.secid[smack_lsmid.slot] = snp->smk_label->smk_secid;
- rc = netlbl_cfg_unlbl_static_add(&init_net, NULL,
-- &snp->smk_host, &snp->smk_mask, PF_INET,
-- snp->smk_label->smk_secid, &audit_info);
-+ &snp->smk_host, &snp->smk_mask, PF_INET, &lsmblob,
-+ &audit_info);
++ 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 563452000729..80133d6e982c 100644
+--- a/security/security.c
++++ b/security/security.c
+@@ -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;
++
++ 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]);
+ }
-
- if (rc == 0)
- rc = count;
+ }
+ EXPORT_SYMBOL(security_cred_getsecid);
+
--
-2.20.1
+2.37.3