--- v10
+++ v31
@@ -1,348 +1,466 @@
-Change the security_task_getsecid() interface to fill in
-a lsmblob structure instead of a u32 secid in support of
-LSM stacking. Audit interfaces will need to collect all
-possible secids for possible reporting.
+Change security_secid_to_secctx() to take a lsmblob as input
+instead of a u32 secid. It will then call the LSM hooks
+using the lsmblob element allocated for that module. The
+callers have been updated as well. This allows for the
+possibility that more than one module may be called upon
+to translate a secid to a string, as can occur in the
+audit code.
+Acked-by: Paul Moore <paul@paul-moore.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
-Reviewed-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
+Cc: netdev@vger.kernel.org
+Cc: linux-audit@redhat.com
+Cc: netfilter-devel@vger.kernel.org
+To: Pablo Neira Ayuso <pablo@netfilter.org>
---
- drivers/android/binder.c | 4 +---
- include/linux/security.h | 7 +++---
- kernel/audit.c | 6 ++---
- kernel/auditfilter.c | 4 +---
- kernel/auditsc.c | 22 ++++++++++++------
- net/netlabel/netlabel_unlabeled.c | 5 +++-
- net/netlabel/netlabel_user.h | 6 ++++-
- security/integrity/ima/ima_appraise.c | 4 +++-
- security/integrity/ima/ima_main.c | 33 +++++++++++++++------------
- security/security.c | 12 +++++++---
- 10 files changed, 63 insertions(+), 40 deletions(-)
+ drivers/android/binder.c | 12 +++++++++-
+ include/linux/security.h | 5 +++--
+ include/net/scm.h | 7 +++++-
+ kernel/audit.c | 20 +++++++++++++++--
+ kernel/auditsc.c | 27 ++++++++++++++++++----
+ net/ipv4/ip_sockglue.c | 4 +++-
+ net/netfilter/nf_conntrack_netlink.c | 14 ++++++++++--
+ net/netfilter/nf_conntrack_standalone.c | 4 +++-
+ net/netfilter/nfnetlink_queue.c | 11 +++++++--
+ net/netlabel/netlabel_unlabeled.c | 30 +++++++++++++++++++++----
+ net/netlabel/netlabel_user.c | 6 ++---
+ security/security.c | 11 +++++----
+ 12 files changed, 122 insertions(+), 29 deletions(-)
diff --git a/drivers/android/binder.c b/drivers/android/binder.c
-index 1962f6b8abd0..144ac4f1c24f 100644
+index cffbe57a8e08..7805d08cd1e7 100644
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
-@@ -3119,11 +3119,9 @@ static void binder_transaction(struct binder_proc *proc,
- t->priority = task_nice(current);
+@@ -2719,10 +2719,20 @@ static void binder_transaction(struct binder_proc *proc,
if (target_node && target_node->txn_security_ctx) {
-- u32 secid;
- struct lsmblob blob;
-
-- security_task_getsecid(proc->tsk, &secid);
-- lsmblob_init(&blob, secid);
-+ security_task_getsecid(proc->tsk, &blob);
- ret = security_secid_to_secctx(&blob, &secctx, &secctx_sz);
+ u32 secid;
++ struct lsmblob blob;
+ size_t added_size;
+
+ security_cred_getsecid(proc->cred, &secid);
+- ret = security_secid_to_secctx(secid, &secctx, &secctx_sz);
++ /*
++ * Later in this patch set security_task_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_task_getsecid(),
++ * which means that the one expected by
++ * security_secid_to_secctx() will be set.
++ */
++ lsmblob_init(&blob, secid);
++ ret = security_secid_to_secctx(&blob, &secctx, &secctx_sz);
if (ret) {
return_error = BR_FAILED_REPLY;
+ return_error_param = ret;
diff --git a/include/linux/security.h b/include/linux/security.h
-index a1659fba6afe..cac477b4c16c 100644
+index 8a547fc4affa..669eff47737a 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
-@@ -392,7 +392,7 @@ int security_task_fix_setuid(struct cred *new, const struct cred *old,
- int security_task_setpgid(struct task_struct *p, pid_t pgid);
- int security_task_getpgid(struct task_struct *p);
- int security_task_getsid(struct task_struct *p);
--void security_task_getsecid(struct task_struct *p, u32 *secid);
-+void security_task_getsecid(struct task_struct *p, struct lsmblob *blob);
- int security_task_setnice(struct task_struct *p, int nice);
- int security_task_setioprio(struct task_struct *p, int ioprio);
- int security_task_getioprio(struct task_struct *p);
-@@ -1021,9 +1021,10 @@ static inline int security_task_getsid(struct task_struct *p)
+@@ -550,7 +550,7 @@ int security_setprocattr(const char *lsm, const char *name, void *value,
+ size_t size);
+ int security_netlink_send(struct sock *sk, struct sk_buff *skb);
+ int security_ismaclabel(const char *name);
+-int security_secid_to_secctx(u32 secid, char **secdata, u32 *seclen);
++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);
+@@ -1406,7 +1406,8 @@ static inline int security_ismaclabel(const char *name)
return 0;
}
--static inline void security_task_getsecid(struct task_struct *p, u32 *secid)
-+static inline void security_task_getsecid(struct task_struct *p,
-+ struct lsmblob *blob)
- {
-- *secid = 0;
-+ lsmblob_init(blob, 0);
+-static inline int security_secid_to_secctx(u32 secid, char **secdata, u32 *seclen)
++static inline int security_secid_to_secctx(struct lsmblob *blob,
++ char **secdata, u32 *seclen)
+ {
+ return -EOPNOTSUPP;
}
-
- static inline int security_task_setnice(struct task_struct *p, int nice)
+diff --git a/include/net/scm.h b/include/net/scm.h
+index 1ce365f4c256..23a35ff1b3f2 100644
+--- a/include/net/scm.h
++++ b/include/net/scm.h
+@@ -92,12 +92,17 @@ 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 lsmblob lb;
+ char *secdata;
+ u32 seclen;
+ int err;
+
+ if (test_bit(SOCK_PASSSEC, &sock->flags)) {
+- err = security_secid_to_secctx(scm->secid, &secdata, &seclen);
++ /* There can only be one security module using the secid,
++ * and the infrastructure will know which it is.
++ */
++ lsmblob_init(&lb, scm->secid);
++ err = security_secid_to_secctx(&lb, &secdata, &seclen);
+
+ if (!err) {
+ put_cmsg(msg, SOL_SOCKET, SCM_SECURITY, seclen, secdata);
diff --git a/kernel/audit.c b/kernel/audit.c
-index d0338411d75d..a0205f3c23c7 100644
+index 121d37e700a6..22286163e93e 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
-@@ -2075,14 +2075,12 @@ int audit_log_task_context(struct audit_buffer *ab)
- char *ctx = NULL;
+@@ -1442,7 +1442,16 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
+ case AUDIT_SIGNAL_INFO:
+ len = 0;
+ if (audit_sig_sid) {
+- err = security_secid_to_secctx(audit_sig_sid, &ctx, &len);
++ 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 (err)
+ return err;
+ }
+@@ -2131,12 +2140,19 @@ int audit_log_task_context(struct audit_buffer *ab)
unsigned len;
int error;
-- u32 sid;
- struct lsmblob blob;
-
-- security_task_getsecid(current, &sid);
-- if (!sid)
-+ security_task_getsecid(current, &blob);
-+ if (!lsmblob_is_set(&blob))
+ u32 sid;
++ struct lsmblob blob;
+
+ security_task_getsecid_subj(current, &sid);
+ if (!sid)
return 0;
-- lsmblob_init(&blob, sid);
- error = security_secid_to_secctx(&blob, &ctx, &len);
+- error = security_secid_to_secctx(sid, &ctx, &len);
++ /*
++ * lsmblob_init sets all values in the lsmblob to sid.
++ * This is temporary until security_task_getsecid is converted
++ * to use a lsmblob, which happens later in this patch set.
++ */
++ lsmblob_init(&blob, sid);
++ error = security_secid_to_secctx(&blob, &ctx, &len);
if (error) {
if (error != -EINVAL)
-diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
-index 8786b95b60bd..8f244c98bb57 100644
---- a/kernel/auditfilter.c
-+++ b/kernel/auditfilter.c
-@@ -1323,7 +1323,6 @@ int audit_filter(int msgtype, unsigned int listtype)
- for (i = 0; i < e->rule.field_count; i++) {
- struct audit_field *f = &e->rule.fields[i];
- pid_t pid;
-- u32 sid;
- struct lsmblob blob;
-
- switch (f->type) {
-@@ -1354,8 +1353,7 @@ int audit_filter(int msgtype, unsigned int listtype)
- case AUDIT_SUBJ_SEN:
- case AUDIT_SUBJ_CLR:
- if (f->lsm_rule) {
-- security_task_getsecid(current, &sid);
-- lsmblob_init(&blob, sid);
-+ security_task_getsecid(current, &blob);
- result = security_audit_rule_match(
- &blob, f->type,
- f->op, f->lsm_rule);
+ goto error_path;
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
-index 148733ec3c72..7112fe31684d 100644
+index e0c71fe27c2f..b28e2cbcc92c 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
-@@ -444,7 +444,6 @@ static int audit_filter_rules(struct task_struct *tsk,
- {
- const struct cred *cred;
- int i, need_sid = 1;
-- u32 sid;
- struct lsmblob blob;
- unsigned int sessionid;
-
-@@ -628,10 +627,9 @@ static int audit_filter_rules(struct task_struct *tsk,
- logged upon error */
- if (f->lsm_rule) {
- if (need_sid) {
-- security_task_getsecid(tsk, &sid);
-+ security_task_getsecid(tsk, &blob);
+@@ -670,6 +670,13 @@ static int audit_filter_rules(struct task_struct *tsk,
+ security_task_getsecid_subj(tsk, &sid);
need_sid = 0;
}
-- lsmblob_init(&blob, sid);
++ /*
++ * lsmblob_init sets all values in the lsmblob
++ * to sid. This is temporary until
++ * security_task_getsecid() is converted to
++ * provide a lsmblob, which happens later in
++ * this patch set.
++ */
+ lsmblob_init(&blob, sid);
result = security_audit_rule_match(&blob,
- f->type,
- f->op,
-@@ -2365,12 +2363,15 @@ 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(t, &context->target_sid);
-+ security_task_getsecid(t, &blob);
-+ /* scaffolding - until target_sid is converted */
-+ context->target_sid = blob.secid[0];
- memcpy(context->target_comm, t->comm, TASK_COMM_LEN);
- }
-
-@@ -2387,6 +2388,7 @@ int audit_signal_info(int sig, struct task_struct *t)
- struct audit_aux_data_pids *axp;
- struct audit_context *ctx = audit_context();
- kuid_t uid = current_uid(), auid, t_uid = task_uid(t);
-+ struct lsmblob blob;
-
- if (auditd_test_task(t) &&
- (sig == SIGTERM || sig == SIGHUP ||
-@@ -2397,7 +2399,9 @@ int audit_signal_info(int sig, struct task_struct *t)
- audit_sig_uid = auid;
- else
- audit_sig_uid = uid;
-- security_task_getsecid(current, &audit_sig_sid);
-+ security_task_getsecid(current, &blob);
-+ /* scaffolding until audit_sig_sid is converted */
-+ audit_sig_sid = blob.secid[0];
- }
-
- if (!audit_signals || audit_dummy_context())
-@@ -2410,7 +2414,9 @@ int audit_signal_info(int sig, 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(t, &ctx->target_sid);
-+ security_task_getsecid(t, &blob);
-+ /* scaffolding until target_sid is converted */
-+ ctx->target_sid = blob.secid[0];
- memcpy(ctx->target_comm, t->comm, TASK_COMM_LEN);
+ f->type, f->op,
+@@ -686,6 +693,13 @@ static int audit_filter_rules(struct task_struct *tsk,
+ if (f->lsm_str) {
+ /* Find files that match */
+ if (name) {
++ /*
++ * lsmblob_init sets all values in the
++ * lsmblob to sid. This is temporary
++ * until name->osid is converted to a
++ * lsmblob, which happens later in
++ * this patch set.
++ */
+ lsmblob_init(&blob, name->osid);
+ result = security_audit_rule_match(
+ &blob,
+@@ -1109,6 +1123,7 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid,
+ char *ctx = NULL;
+ u32 len;
+ int rc = 0;
++ struct lsmblob blob;
+
+ ab = audit_log_start(context, GFP_KERNEL, AUDIT_OBJ_PID);
+ if (!ab)
+@@ -1118,7 +1133,8 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid,
+ from_kuid(&init_user_ns, auid),
+ from_kuid(&init_user_ns, uid), sessionid);
+ if (sid) {
+- if (security_secid_to_secctx(sid, &ctx, &len)) {
++ lsmblob_init(&blob, sid);
++ if (security_secid_to_secctx(&blob, &ctx, &len)) {
+ audit_log_format(ab, " obj=(none)");
+ rc = 1;
+ } else {
+@@ -1362,8 +1378,10 @@ static void show_special(struct audit_context *context, int *call_panic)
+ if (osid) {
+ char *ctx = NULL;
+ u32 len;
++ struct lsmblob blob;
+
+- if (security_secid_to_secctx(osid, &ctx, &len)) {
++ lsmblob_init(&blob, osid);
++ if (security_secid_to_secctx(&blob, &ctx, &len)) {
+ audit_log_format(ab, " osid=%u", osid);
+ *call_panic = 1;
+ } else {
+@@ -1524,9 +1542,10 @@ static void audit_log_name(struct audit_context *context, struct audit_names *n,
+ if (n->osid != 0) {
+ char *ctx = NULL;
+ u32 len;
++ struct lsmblob blob;
+
+- if (security_secid_to_secctx(
+- n->osid, &ctx, &len)) {
++ lsmblob_init(&blob, n->osid);
++ if (security_secid_to_secctx(&blob, &ctx, &len)) {
+ audit_log_format(ab, " osid=%u", n->osid);
+ if (call_panic)
+ *call_panic = 2;
+diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
+index 38d29b175ca6..be7073df19a5 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 lsmblob lb;
+ char *secdata;
+ u32 seclen, secid;
+ int err;
+@@ -138,7 +139,8 @@ static void ip_cmsg_recv_security(struct msghdr *msg, struct sk_buff *skb)
+ if (err)
+ return;
+
+- err = security_secid_to_secctx(secid, &secdata, &seclen);
++ lsmblob_init(&lb, secid);
++ err = security_secid_to_secctx(&lb, &secdata, &seclen);
+ if (err)
+ return;
+
+diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
+index c7708bde057c..67b0f3cfc5c7 100644
+--- a/net/netfilter/nf_conntrack_netlink.c
++++ b/net/netfilter/nf_conntrack_netlink.c
+@@ -341,8 +341,13 @@ static int ctnetlink_dump_secctx(struct sk_buff *skb, const struct nf_conn *ct)
+ struct nlattr *nest_secctx;
+ int len, ret;
+ char *secctx;
++ struct lsmblob blob;
+
+- ret = security_secid_to_secctx(ct->secmark, &secctx, &len);
++ /* lsmblob_init() puts ct->secmark into all of the secids in blob.
++ * security_secid_to_secctx() will know which security module
++ * to use to create the secctx. */
++ lsmblob_init(&blob, ct->secmark);
++ ret = security_secid_to_secctx(&blob, &secctx, &len);
+ if (ret)
return 0;
- }
-@@ -2431,7 +2437,9 @@ int audit_signal_info(int sig, 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(t, &axp->target_sid[axp->pid_count]);
-+ security_task_getsecid(t, &blob);
-+ /* scaffolding until target_sid is converted */
-+ axp->target_sid[axp->pid_count] = blob.secid[0];
- memcpy(axp->target_comm[axp->pid_count], t->comm, TASK_COMM_LEN);
- axp->pid_count++;
-
+
+@@ -650,8 +655,13 @@ static inline int ctnetlink_secctx_size(const struct nf_conn *ct)
+ {
+ #ifdef CONFIG_NF_CONNTRACK_SECMARK
+ int len, ret;
++ struct lsmblob blob;
+
+- ret = security_secid_to_secctx(ct->secmark, NULL, &len);
++ /* lsmblob_init() puts ct->secmark into all of the secids in blob.
++ * security_secid_to_secctx() will know which security module
++ * to use to create the secctx. */
++ lsmblob_init(&blob, ct->secmark);
++ ret = security_secid_to_secctx(&blob, NULL, &len);
+ if (ret)
+ return 0;
+
+diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
+index 80f675d884b2..79c280d1efce 100644
+--- a/net/netfilter/nf_conntrack_standalone.c
++++ b/net/netfilter/nf_conntrack_standalone.c
+@@ -178,8 +178,10 @@ static void ct_show_secctx(struct seq_file *s, const struct nf_conn *ct)
+ int ret;
+ u32 len;
+ char *secctx;
++ struct lsmblob blob;
+
+- ret = security_secid_to_secctx(ct->secmark, &secctx, &len);
++ lsmblob_init(&blob, ct->secmark);
++ ret = security_secid_to_secctx(&blob, &secctx, &len);
+ if (ret)
+ return;
+
+diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
+index 4acc4b8e9fe5..62c0c5b847c6 100644
+--- a/net/netfilter/nfnetlink_queue.c
++++ b/net/netfilter/nfnetlink_queue.c
+@@ -305,13 +305,20 @@ static u32 nfqnl_get_sk_secctx(struct sk_buff *skb, char **secdata)
+ {
+ u32 seclen = 0;
+ #if IS_ENABLED(CONFIG_NETWORK_SECMARK)
++ struct lsmblob blob;
++
+ if (!skb || !sk_fullsock(skb->sk))
+ return 0;
+
+ read_lock_bh(&skb->sk->sk_callback_lock);
+
+- if (skb->secmark)
+- security_secid_to_secctx(skb->secmark, secdata, &seclen);
++ if (skb->secmark) {
++ /* lsmblob_init() puts ct->secmark into all of the secids in
++ * blob. security_secid_to_secctx() will know which security
++ * module to use to create the secctx. */
++ lsmblob_init(&blob, skb->secmark);
++ security_secid_to_secctx(&blob, secdata, &seclen);
++ }
+
+ read_unlock_bh(&skb->sk->sk_callback_lock);
+ #endif
diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c
-index 2d8dd5b84457..2294aa9471e6 100644
+index 762561318d78..51cb4fce5edf 100644
--- a/net/netlabel/netlabel_unlabeled.c
+++ b/net/netlabel/netlabel_unlabeled.c
-@@ -1552,11 +1552,14 @@ int __init netlbl_unlabel_defconf(void)
- int ret_val;
- struct netlbl_dom_map *entry;
- struct netlbl_audit audit_info;
-+ struct lsmblob blob;
-
- /* Only the kernel is allowed to call this function and the only time
- * it is called is at bootup before the audit subsystem is reporting
- * messages so don't worry to much about these values. */
-- security_task_getsecid(current, &audit_info.secid);
-+ security_task_getsecid(current, &blob);
-+ /* scaffolding until audit_info.secid is converted */
-+ audit_info.secid = blob.secid[0];
- audit_info.loginuid = GLOBAL_ROOT_UID;
- audit_info.sessionid = 0;
-
-diff --git a/net/netlabel/netlabel_user.h b/net/netlabel/netlabel_user.h
-index 4a397cde1a48..ab88baaaa50d 100644
---- a/net/netlabel/netlabel_user.h
-+++ b/net/netlabel/netlabel_user.h
-@@ -48,7 +48,11 @@
- static inline void netlbl_netlink_auditinfo(struct sk_buff *skb,
- struct netlbl_audit *audit_info)
- {
-- security_task_getsecid(current, &audit_info->secid);
-+ struct lsmblob blob;
-+
-+ security_task_getsecid(current, &blob);
-+ /* scaffolding until secid is converted */
-+ audit_info->secid = blob.secid[0];
- audit_info->loginuid = audit_get_loginuid(current);
- audit_info->sessionid = audit_get_sessionid(current);
- }
-diff --git a/security/integrity/ima/ima_appraise.c b/security/integrity/ima/ima_appraise.c
-index 5fb7127bbe68..85c7692fc4a3 100644
---- a/security/integrity/ima/ima_appraise.c
-+++ b/security/integrity/ima/ima_appraise.c
-@@ -51,11 +51,13 @@ bool is_ima_appraise_enabled(void)
- int ima_must_appraise(struct inode *inode, int mask, enum ima_hooks func)
- {
+@@ -376,6 +376,7 @@ int netlbl_unlhsh_add(struct net *net,
+ struct audit_buffer *audit_buf = NULL;
+ char *secctx = NULL;
+ u32 secctx_len;
++ struct lsmblob blob;
+
+ if (addr_len != sizeof(struct in_addr) &&
+ addr_len != sizeof(struct in6_addr))
+@@ -438,7 +439,11 @@ int netlbl_unlhsh_add(struct net *net,
+ unlhsh_add_return:
+ rcu_read_unlock();
+ if (audit_buf != NULL) {
+- if (security_secid_to_secctx(secid,
++ /* lsmblob_init() puts secid into all of the secids in blob.
++ * security_secid_to_secctx() will know which security module
++ * to use to create the secctx. */
++ lsmblob_init(&blob, secid);
++ if (security_secid_to_secctx(&blob,
+ &secctx,
+ &secctx_len) == 0) {
+ audit_log_format(audit_buf, " sec_obj=%s", secctx);
+@@ -475,6 +480,7 @@ static int netlbl_unlhsh_remove_addr4(struct net *net,
+ struct net_device *dev;
+ char *secctx;
+ u32 secctx_len;
++ struct lsmblob blob;
+
+ spin_lock(&netlbl_unlhsh_lock);
+ list_entry = netlbl_af4list_remove(addr->s_addr, mask->s_addr,
+@@ -493,8 +499,13 @@ static int netlbl_unlhsh_remove_addr4(struct net *net,
+ (dev != NULL ? dev->name : NULL),
+ addr->s_addr, mask->s_addr);
+ dev_put(dev);
++ /* lsmblob_init() puts entry->secid into all of the secids
++ * in blob. security_secid_to_secctx() will know which
++ * security module to use to create the secctx. */
++ if (entry != NULL)
++ lsmblob_init(&blob, entry->secid);
+ if (entry != NULL &&
+- security_secid_to_secctx(entry->secid,
++ security_secid_to_secctx(&blob,
+ &secctx, &secctx_len) == 0) {
+ audit_log_format(audit_buf, " sec_obj=%s", secctx);
+ security_release_secctx(secctx, secctx_len);
+@@ -536,6 +547,7 @@ static int netlbl_unlhsh_remove_addr6(struct net *net,
+ struct net_device *dev;
+ char *secctx;
+ u32 secctx_len;
++ struct lsmblob blob;
+
+ spin_lock(&netlbl_unlhsh_lock);
+ list_entry = netlbl_af6list_remove(addr, mask, &iface->addr6_list);
+@@ -553,8 +565,13 @@ static int netlbl_unlhsh_remove_addr6(struct net *net,
+ (dev != NULL ? dev->name : NULL),
+ addr, mask);
+ dev_put(dev);
++ /* lsmblob_init() puts entry->secid into all of the secids
++ * in blob. security_secid_to_secctx() will know which
++ * security module to use to create the secctx. */
++ if (entry != NULL)
++ lsmblob_init(&blob, entry->secid);
+ if (entry != NULL &&
+- security_secid_to_secctx(entry->secid,
++ security_secid_to_secctx(&blob,
+ &secctx, &secctx_len) == 0) {
+ audit_log_format(audit_buf, " sec_obj=%s", secctx);
+ security_release_secctx(secctx, secctx_len);
+@@ -1080,6 +1097,7 @@ static int netlbl_unlabel_staticlist_gen(u32 cmd,
u32 secid;
-+ struct lsmblob blob;
-
- if (!ima_appraise)
- return 0;
-
-- security_task_getsecid(current, &secid);
-+ security_task_getsecid(current, &blob);
-+ lsmblob_secid(&blob, &secid);
- return ima_match_policy(inode, current_cred(), secid, func, mask,
- IMA_APPRAISE | IMA_HASH, NULL);
- }
-diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
-index 357edd140c09..fefa848cf0c7 100644
---- a/security/integrity/ima/ima_main.c
-+++ b/security/integrity/ima/ima_main.c
-@@ -335,12 +335,13 @@ static int process_measurement(struct file *file, const struct cred *cred,
- */
- int ima_file_mmap(struct file *file, unsigned long prot)
- {
-- u32 secid;
-+ struct lsmblob blob;
-
- if (file && (prot & PROT_EXEC)) {
-- security_task_getsecid(current, &secid);
-- return process_measurement(file, current_cred(), secid, NULL,
-- 0, MAY_EXEC, MMAP_CHECK);
-+ security_task_getsecid(current, &blob);
-+ /* scaffolding - until process_measurement changes */
-+ return process_measurement(file, current_cred(), blob.secid[0],
-+ NULL, 0, MAY_EXEC, MMAP_CHECK);
+ char *secctx;
+ u32 secctx_len;
++ struct lsmblob blob;
+
+ data = genlmsg_put(cb_arg->skb, NETLINK_CB(cb_arg->nl_cb->skb).portid,
+ cb_arg->seq, &netlbl_unlabel_gnl_family,
+@@ -1134,7 +1152,11 @@ static int netlbl_unlabel_staticlist_gen(u32 cmd,
+ secid = addr6->secid;
}
- return 0;
-@@ -363,10 +364,12 @@ int ima_bprm_check(struct linux_binprm *bprm)
- {
- int ret;
- u32 secid;
-+ struct lsmblob blob;
-
-- security_task_getsecid(current, &secid);
-- ret = process_measurement(bprm->file, current_cred(), secid, NULL, 0,
-- MAY_EXEC, BPRM_CHECK);
-+ security_task_getsecid(current, &blob);
-+ /* scaffolding until process_measurement changes */
-+ ret = process_measurement(bprm->file, current_cred(), blob.secid[0],
-+ NULL, 0, MAY_EXEC, BPRM_CHECK);
- if (ret)
- return ret;
-
-@@ -387,10 +390,11 @@ int ima_bprm_check(struct linux_binprm *bprm)
- */
- int ima_file_check(struct file *file, int mask)
- {
-- u32 secid;
-+ struct lsmblob blob;
-
-- security_task_getsecid(current, &secid);
-- return process_measurement(file, current_cred(), secid, NULL, 0,
-+ security_task_getsecid(current, &blob);
-+ /* scaffolding until process_measurement changes */
-+ return process_measurement(file, current_cred(), blob.secid[0], NULL, 0,
- mask & (MAY_READ | MAY_WRITE | MAY_EXEC |
- MAY_APPEND), FILE_CHECK);
- }
-@@ -499,7 +503,7 @@ int ima_post_read_file(struct file *file, void *buf, loff_t size,
- enum kernel_read_file_id read_id)
- {
- enum ima_hooks func;
-- u32 secid;
-+ struct lsmblob blob;
-
- if (!file && read_id == READING_FIRMWARE) {
- if ((ima_appraise & IMA_APPRAISE_FIRMWARE) &&
-@@ -521,9 +525,10 @@ int ima_post_read_file(struct file *file, void *buf, loff_t size,
+- ret_val = security_secid_to_secctx(secid, &secctx, &secctx_len);
++ /* lsmblob_init() secid into all of the secids in blob.
++ * security_secid_to_secctx() will know which security module
++ * to use to create the secctx. */
++ lsmblob_init(&blob, secid);
++ ret_val = security_secid_to_secctx(&blob, &secctx, &secctx_len);
+ if (ret_val != 0)
+ goto list_cb_failure;
+ ret_val = nla_put(cb_arg->skb,
+diff --git a/net/netlabel/netlabel_user.c b/net/netlabel/netlabel_user.c
+index 3ed4fea2a2de..893301ae0131 100644
+--- a/net/netlabel/netlabel_user.c
++++ b/net/netlabel/netlabel_user.c
+@@ -86,6 +86,7 @@ struct audit_buffer *netlbl_audit_start_common(int type,
+ struct audit_buffer *audit_buf;
+ char *secctx;
+ u32 secctx_len;
++ struct lsmblob blob;
+
+ if (audit_enabled == AUDIT_OFF)
+ return NULL;
+@@ -98,10 +99,9 @@ struct audit_buffer *netlbl_audit_start_common(int type,
+ from_kuid(&init_user_ns, audit_info->loginuid),
+ audit_info->sessionid);
+
++ lsmblob_init(&blob, audit_info->secid);
+ if (audit_info->secid != 0 &&
+- security_secid_to_secctx(audit_info->secid,
+- &secctx,
+- &secctx_len) == 0) {
++ security_secid_to_secctx(&blob, &secctx, &secctx_len) == 0) {
+ audit_log_format(audit_buf, " subj=%s", secctx);
+ security_release_secctx(secctx, secctx_len);
}
-
- func = read_idmap[read_id] ?: FILE_CHECK;
-- security_task_getsecid(current, &secid);
-- return process_measurement(file, current_cred(), secid, buf, size,
-- MAY_READ, func);
-+ security_task_getsecid(current, &blob);
-+ /* scaffolding until process_measurement changes */
-+ return process_measurement(file, current_cred(), blob.secid[0], buf,
-+ size, MAY_READ, func);
- }
-
- /**
diff --git a/security/security.c b/security/security.c
-index e4b50ae05f6c..10ba7459f58c 100644
+index 7ae68b6ffc7f..a0612afefc24 100644
--- a/security/security.c
+++ b/security/security.c
-@@ -1651,10 +1651,16 @@ int security_task_getsid(struct task_struct *p)
- return call_int_hook(task_getsid, 0, p);
+@@ -2176,17 +2176,16 @@ int security_ismaclabel(const char *name)
}
-
--void security_task_getsecid(struct task_struct *p, u32 *secid)
-+void security_task_getsecid(struct task_struct *p, struct lsmblob *blob)
- {
-- *secid = 0;
-- call_void_hook(task_getsecid, p, secid);
-+ struct security_hook_list *hp;
-+
-+ lsmblob_init(blob, 0);
-+ hlist_for_each_entry(hp, &security_hook_heads.task_getsecid, list) {
+ EXPORT_SYMBOL(security_ismaclabel);
+
+-int security_secid_to_secctx(u32 secid, char **secdata, u32 *seclen)
++int security_secid_to_secctx(struct lsmblob *blob, char **secdata, u32 *seclen)
+ {
+ struct security_hook_list *hp;
+ int rc;
+
+- /*
+- * Currently, only one LSM can implement secid_to_secctx (i.e this
+- * LSM hook is not "stackable").
+- */
+ hlist_for_each_entry(hp, &security_hook_heads.secid_to_secctx, list) {
+- rc = hp->hook.secid_to_secctx(secid, secdata, seclen);
+ if (WARN_ON(hp->lsmid->slot < 0 || hp->lsmid->slot >= lsm_slot))
+ continue;
-+ hp->hook.task_getsecid(p, &blob->secid[hp->lsmid->slot]);
-+ }
- }
- EXPORT_SYMBOL(security_task_getsecid);
-
++ rc = hp->hook.secid_to_secctx(blob->secid[hp->lsmid->slot],
++ secdata, seclen);
+ if (rc != LSM_RET_DEFAULT(secid_to_secctx))
+ return rc;
+ }
--
-2.20.1
+2.31.1