From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC2A0C10F0E for ; Tue, 9 Apr 2019 21:40:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 86CD12082A for ; Tue, 9 Apr 2019 21:40:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=yahoo.com header.i=@yahoo.com header.b="hpbb02g1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726699AbfDIVkm (ORCPT ); Tue, 9 Apr 2019 17:40:42 -0400 Received: from sonic317-39.consmr.mail.ne1.yahoo.com ([66.163.184.50]:36837 "EHLO sonic317-39.consmr.mail.ne1.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726723AbfDIVkl (ORCPT ); Tue, 9 Apr 2019 17:40:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1554846039; bh=NLJ9WRLN3mqnoEKmIr7GkqEF3TZIbdXheKniGVooL5g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Subject; b=hpbb02g1734AJK9hnJdRuVQFKl8mzH2EiVbMg6o+YSmGopivzQma/hOHmaqSSbsdTLwgbCLYaZe3bSGDILAgSWNdFugHHKpE3LWC0YEEuqAobLGix6ihRU/ptju/WXK3dXWnLSnYNwFyV5CRakyFpzwRs8kQWnChYaS9oNWICFESzDAe53XXRwBqyJnuOyMHGKC9zn4T6X1PSBSPMNtz3ILqX5aTAn3xheQJ2ytWZV9tpUqyptx+ZUU0yqiY/9hXBxZ4bbg1EUH2F0DkMwBSsMLiib7GJDjGqS78PJEsdmC2TacfqxxGi8KJZ2HwKMare8fxriSNGUkwxLRGZHaJYg== X-YMail-OSG: rxa44sUVM1kyT3Tg4RitZ3uVZKd17iHqtVBpjw5xVTMMIQCU7VAhIwyzczscjxt Evn1TKzzbRyVVYRH.TpqluY9YFb4L.43tIaePBMluYzHvq1UpZ3eGjEXQ0SQpdnmDY9in.n76c0u lRoh96_XP_e_iYTaXMJ0ctw9pCy46QEPSlK4WoQy5RN9a0nSVhEBkyAWzPVOa0.cr583j4mb0p.K pmQAG9ODM.5DP.AzIF69dauHig1OM6N8_16uCxwPudnpgWnge4qcim3iCbDIPwPX6FSh7iayiORC RsDvbOlCY08Sz1rAXrrY57Xaev39fTrw1J7gTQYvuA_j2LgTVNOBTdIp0uFtUe1u7nBzPO7oHGuW b3kNKAvbYyRnBAQjTfp5eQHiojCUFUgHyWxZbh91ngpiXw.re6AodDmLJJPPXopqSWaJPHWUFTsx xAcn4X0_HiHeRaCBoZ7mOZrQjNAWu5AP9zmiOPeKXtaareZdB.jWA4qOuogmiIq0RfFumO5dBjG6 U.fvSjFF7AhzVs1c.HDfijKllSDMRLIJ_bU5zf.AIwDk7ft5_UhouFkjgR3Czmk2lYk1E8ucQHlP O1Rv7FLPa4.Wv7cExLOnfag9C0Z7yvsGajUZk7UjtOYjE8GP9QsPM0aZuwvEmBIKi61oy.GG3Iol QN0X0whRGf0u2OILGRCW.2e_X5CaiXo9Ml3CWwylxqYxbpdhNtLDkwBBSRg.Fpw34G6d83qfT_2D Ci2r3WtS7mZojNjgKuVICEbpeTw5xUog3TPeSRqUqz.WGgw7edVhxwNEyUl6iLY5YHdMj3kzSFxx JdYWreKpCaU_CU7219lwzBqEgmvTzEt0aPunuG5wcEuKeNHhK6QNuHQ10cOwNrKUe3T1.TxBsLNP Z3euQbRpqcixnLt53Dm8ZIdPFhYsVhOLos8jkM_GWoFSjtTSybgNw97Pmzt2KHQTz3g.lMLyeHUD VNrXpGkAhxvq6tM0Lw4C6ChA4Xce.y6Figx5ZRclzkydPLgVIFI9nplxZf3m55HuXs6FldJh2ADT Rz7DTf881t8l5c98Wjd0yJnzJEv518TG5_jwURLLbD9PhDBt0sSsdsXrBJdpOeD2g0r7kZtdEtVI Fzq3Fzob9UXNqaekOj0QX7uhwrloMGOVZOE3GxQ5cRpXdu9zdrRY9wrqhzisilw-- Received: from sonic.gate.mail.ne1.yahoo.com by sonic317.consmr.mail.ne1.yahoo.com with HTTP; Tue, 9 Apr 2019 21:40:39 +0000 Received: from c-67-169-65-224.hsd1.ca.comcast.net (EHLO localhost.localdomain) ([67.169.65.224]) by smtp407.mail.ne1.yahoo.com (Oath Hermes SMTP Server) with ESMTPA ID 0f9fc43d6127678694d9e39aed29be56; Tue, 09 Apr 2019 21:40:35 +0000 (UTC) From: Casey Schaufler To: casey.schaufler@intel.com, jmorris@namei.org, linux-security-module@vger.kernel.org, selinux@vger.kernel.org Cc: casey@schaufler-ca.com Subject: [PATCH 25/59] Audit: Convert osid to an lsm_export structure Date: Tue, 9 Apr 2019 14:39:12 -0700 Message-Id: <20190409213946.1667-26-casey@schaufler-ca.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20190409213946.1667-1-casey@schaufler-ca.com> References: <20190409213946.1667-1-casey@schaufler-ca.com> Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org Convert osid to be an lsm_export structure instead of a u32 secid. Clean out the associated scaffolding. Change the name to olsm to be descriptive. Signed-off-by: Casey Schaufler --- kernel/audit.c | 4 +--- kernel/audit.h | 4 ++-- kernel/auditsc.c | 36 ++++++++++++------------------------ 3 files changed, 15 insertions(+), 29 deletions(-) diff --git a/kernel/audit.c b/kernel/audit.c index 5226e2af9498..d83d1f05c95d 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -2073,12 +2073,10 @@ int audit_log_task_context(struct audit_buffer *ab) char *ctx = NULL; unsigned len; int error; - u32 sid; struct lsm_export le; security_task_getsecid(current, &le); - lsm_export_secid(&le, &sid); - if (!sid) + if (!lsm_export_any(&le)) return 0; error = security_secid_to_secctx(&le, &ctx, &len); diff --git a/kernel/audit.h b/kernel/audit.h index e2e6fa911f9c..7d2fcdf0bc94 100644 --- a/kernel/audit.h +++ b/kernel/audit.h @@ -91,7 +91,7 @@ struct audit_names { kuid_t uid; kgid_t gid; dev_t rdev; - u32 osid; + struct lsm_export olsm; struct audit_cap_data fcap; unsigned int fcap_ver; unsigned char type; /* record type */ @@ -165,7 +165,7 @@ struct audit_context { kuid_t uid; kgid_t gid; umode_t mode; - u32 osid; + struct lsm_export olsm; int has_perm; uid_t perm_uid; gid_t perm_gid; diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 75d181029d40..d64775f4bb1b 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -645,17 +645,15 @@ static int audit_filter_rules(struct task_struct *tsk, if (f->lsm_rule) { /* Find files that match */ if (name) { - lsm_export_to_all(&le, name->osid); result = security_audit_rule_match( - &le, + &name->olsm, f->type, f->op, f->lsm_rule); } else if (ctx) { list_for_each_entry(n, &ctx->names_list, list) { - lsm_export_to_all(&le, n->osid); if (security_audit_rule_match( - &le, + &n->olsm, f->type, f->op, f->lsm_rule)) { @@ -667,8 +665,7 @@ static int audit_filter_rules(struct task_struct *tsk, /* Find ipc objects that match */ if (!ctx || ctx->type != AUDIT_IPC) break; - lsm_export_to_all(&le, ctx->ipc.osid); - if (security_audit_rule_match(&le, + if (security_audit_rule_match(&ctx->ipc.olsm, f->type, f->op, f->lsm_rule)) ++result; @@ -1187,19 +1184,17 @@ static void show_special(struct audit_context *context, int *call_panic) context->socketcall.args[i]); break; } case AUDIT_IPC: { - u32 osid = context->ipc.osid; + struct lsm_export *l = &context->ipc.olsm; audit_log_format(ab, "ouid=%u ogid=%u mode=%#ho", from_kuid(&init_user_ns, context->ipc.uid), from_kgid(&init_user_ns, context->ipc.gid), context->ipc.mode); - if (osid) { + if (lsm_export_any(l)) { char *ctx = NULL; u32 len; - struct lsm_export le; - lsm_export_to_all(&le, osid); - if (security_secid_to_secctx(&le, &ctx, &len)) { - audit_log_format(ab, " osid=%u", osid); + if (security_secid_to_secctx(l, &ctx, &len)) { + audit_log_format(ab, " osid=(unknown)"); *call_panic = 1; } else { audit_log_format(ab, " obj=%s", ctx); @@ -1346,14 +1341,12 @@ static void audit_log_name(struct audit_context *context, struct audit_names *n, from_kgid(&init_user_ns, n->gid), MAJOR(n->rdev), MINOR(n->rdev)); - if (n->osid != 0) { + if (lsm_export_any(&n->olsm)) { char *ctx = NULL; u32 len; - struct lsm_export le; - lsm_export_to_all(&le, n->osid); - if (security_secid_to_secctx(&le, &ctx, &len)) { - audit_log_format(ab, " osid=%u", n->osid); + if (security_secid_to_secctx(&n->olsm, &ctx, &len)) { + audit_log_format(ab, " osid=(unknown)"); if (call_panic) *call_panic = 2; } else { @@ -1907,16 +1900,13 @@ static inline int audit_copy_fcaps(struct audit_names *name, void audit_copy_inode(struct audit_names *name, const struct dentry *dentry, struct inode *inode, unsigned int flags) { - struct lsm_export le; - name->ino = inode->i_ino; name->dev = inode->i_sb->s_dev; name->mode = inode->i_mode; name->uid = inode->i_uid; name->gid = inode->i_gid; name->rdev = inode->i_rdev; - security_inode_getsecid(inode, &le); - lsm_export_secid(&le, &name->osid); + security_inode_getsecid(inode, &name->olsm); if (flags & AUDIT_INODE_NOEVAL) { name->fcap_ver = -1; return; @@ -2266,13 +2256,11 @@ void __audit_mq_getsetattr(mqd_t mqdes, struct mq_attr *mqstat) void __audit_ipc_obj(struct kern_ipc_perm *ipcp) { struct audit_context *context = audit_context(); - struct lsm_export le; context->ipc.uid = ipcp->uid; context->ipc.gid = ipcp->gid; context->ipc.mode = ipcp->mode; context->ipc.has_perm = 0; - security_ipc_getsecid(ipcp, &le); - lsm_export_secid(&le, &context->ipc.osid); + security_ipc_getsecid(ipcp, &context->ipc.olsm); context->type = AUDIT_IPC; } -- 2.19.1