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.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 2FB26C35240 for ; Fri, 24 Jan 2020 00:25:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E85132087E for ; Fri, 24 Jan 2020 00:25:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=yahoo.com header.i=@yahoo.com header.b="r/Uw6t1i" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729934AbgAXAZP (ORCPT ); Thu, 23 Jan 2020 19:25:15 -0500 Received: from sonic304-28.consmr.mail.ne1.yahoo.com ([66.163.191.154]:34262 "EHLO sonic304-28.consmr.mail.ne1.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729904AbgAXAZP (ORCPT ); Thu, 23 Jan 2020 19:25:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1579825512; bh=1D8r3Dnj/9NK4aDU/fcz4TTruvjavNXHm1jmWhMDoSQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Subject; b=r/Uw6t1ifv+NBhCqRjpJDFNZwY6xpflTGqS0b+BWPoSZrSNKX2Mip+IMw2dW5osb7y+NLo2wlqTG2m0TGV/2ZAoULFd25qXHlZZzYWX5f41RZWyZqpKIDc51TgJ0KLzjLnqhJUQIseaXKlSN8gy+6TaLfmwZ3sfXvhCbXs3uPcEcNXipf0I9yzuf1hlSTVA3ghRFkZcUqSW5SFO9QH9HiKOgAfPrS7+Zu7+pfjwhAF0FyCHx8YWwlTjpmdydfOZJv+tdWBxK40bTbdoUY9L/LT20AoqQVfOy7oKK9w1jesswgMVnnmywAzHrXo11MLoUTJ0rN7aaXXx1t4pq71RAUg== X-YMail-OSG: o96SM3cVM1lPYDLbCgpq13s9nC4lwFdJm3Nii7_JoPSjwSUN3qFHXoBPC4tKQFR AxM0sizIGFITdYcXTnYE8W7eqfxgzhk2h7mBpi8xpaGIAxsmDK6kCoLldf6Yw9vUq9GTUcY_dyhQ f0GLpN7.Uq8_ABkIOCYO3bDJxZoziCcE0cf.g1bADJIqjkynZg_K2QlITtMA5DIwR3hPB2jNoh_6 mmCUiw_gfSzEkd5sXK5z.Fwih1kCYLyvelHMq7H8BhKo5z6zfZmeNgZazTwPPni4sYHfhhZmGcbi O0y_HH8VA_v7_uJvQ5ORakggzhrhT30boysxOXG_IKDHC9tdQ0wjkMJnyfQ38X63e1iIln8mvA9m FFFyiCx0hEdJbFCCl0dMRXrEm2rdUCF3RGnKZAjOFDPyXWl4THSaKGqJVA884CyLDm.cp.nPwNv6 CfP8ov6u_Ap0FdF3cbVCtDRGfPWw1SClwi0pPOKp_X43W5oRRrwyWKh4M.KVMX9aEPPrTH9Jx65X HDTbcVats1XT5b6DLfTYfaVo8h5xgcDY0ImW12ximfayi0_sWxNv7Zx4LmSsBMv4riAuJIqD3Ghq sc2CSuYtkJtX9sy0E4y_CrpCE7vG1JzjXSoWMGsd1vQ1D6A85uXvw.SpHFWL3LgoOfUJVZcUXHst 0Tt7B_EDzGca3ilqBvoQdRykFh2i5fQV9NwWu3r9yDI7wJnzuQeusW0cZw18FkeIJ2QF4bftSK9F CqnhTWmA4C3W3CdTHtd6qP.2cF0UHxn11F3ZVLQyUhAsxySKa349OodlCO.6SrOAlUF7sQYbB07y luDm2IGgVctvM8SttjCrX24t9mKk0C9PLr1wg60_bxlsStbeFByBM_uqWcRCOPWxt.zPdzHu7OE6 80DEGZBoLnw61RjhNazz7mwrVXulnf3FXHs9uNAAs9KCGvCT8qCRDSaXw1HgX7m6iirmhrOmW2JM zCHR.kDdVxXAxV1Pd5iEx1t1OSG40sIxDSfQ6MyPYAk_c.1iPTGR0FgtGl3h_xi6nfrYknggNWOx nPuUnqRbVy2sWsAxgcgnwmStczdJ6ADGvnbdIrnEt7DQjeUE2.w8ufdSvgXLzk5ukRkkI9oOK0OP ym2kZPMzdTVvDlrywW5F8sFiCpqfFNsOybr7J_BsPOMM0ZbIQJoAWek.lTP0NOpCvaGmczRGg2hB mnAjegYDw5yDNx6DH3IoFilNfrficujxAPmECumhQycdkzL_f6OtsvlvakIHCffvyTBF5kjtvtmi QC2UhbnywTP0Kq4OH_rdeh81n7dJHmL24SAfdRSLqo80TNzDWIIxAAMOfhi95qYNr4pw8_blNJwf 0D0crs0YSV9FWEflZIzbTp9UWou044e6J33Ndcc7.bFlr.gvpnYzbBH9aFk2oCiXJun_AzJlMedR GmO3rYcC5UEDllLjnwPFiJLKmBbaop.x4bxWFmdlaTfgoQUrxbrEltIbqWiYj2dZZpF8.P3_Khg- - Received: from sonic.gate.mail.ne1.yahoo.com by sonic304.consmr.mail.ne1.yahoo.com with HTTP; Fri, 24 Jan 2020 00:25:12 +0000 Received: by smtp423.mail.bf1.yahoo.com (Oath Hermes SMTP Server) with ESMTPA ID fa03a9a6bb2ee60ca432da5cd71a54a0; Fri, 24 Jan 2020 00:25:07 +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, keescook@chromium.org, john.johansen@canonical.com, penguin-kernel@i-love.sakura.ne.jp, paul@paul-moore.com, sds@tycho.nsa.gov Subject: [PATCH v14 12/23] IMA: Change internal interfaces to use lsmblobs Date: Thu, 23 Jan 2020 16:22:55 -0800 Message-Id: <20200124002306.3552-13-casey@schaufler-ca.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200124002306.3552-1-casey@schaufler-ca.com> References: <20200124002306.3552-1-casey@schaufler-ca.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org The IMA interfaces ima_get_action() and ima_match_policy() call LSM functions that use lsmblobs. Change the IMA functions to pass the lsmblob to be compatible with the LSM functions. Reviewed-by: Kees Cook Reviewed-by: John Johansen Acked-by: Stephen Smalley Signed-off-by: Casey Schaufler cc: linux-integrity@vger.kernel.org --- security/integrity/ima/ima.h | 11 ++++----- security/integrity/ima/ima_api.c | 10 ++++----- security/integrity/ima/ima_appraise.c | 5 ++--- security/integrity/ima/ima_main.c | 32 +++++++++++---------------- security/integrity/ima/ima_policy.c | 12 +++++----- 5 files changed, 32 insertions(+), 38 deletions(-) diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h index d95b0ece7434..96b6662ea39f 100644 --- a/security/integrity/ima/ima.h +++ b/security/integrity/ima/ima.h @@ -205,9 +205,9 @@ extern const char *const func_tokens[]; struct modsig; /* LIM API function definitions */ -int ima_get_action(struct inode *inode, const struct cred *cred, u32 secid, - int mask, enum ima_hooks func, int *pcr, - struct ima_template_desc **template_desc); +int ima_get_action(struct inode *inode, const struct cred *cred, + struct lsmblob *blob, int mask, enum ima_hooks func, + int *pcr, struct ima_template_desc **template_desc); int ima_must_measure(struct inode *inode, int mask, enum ima_hooks func); int ima_collect_measurement(struct integrity_iint_cache *iint, struct file *file, void *buf, loff_t size, @@ -232,8 +232,9 @@ void ima_free_template_entry(struct ima_template_entry *entry); const char *ima_d_path(const struct path *path, char **pathbuf, char *filename); /* IMA policy related functions */ -int ima_match_policy(struct inode *inode, const struct cred *cred, u32 secid, - enum ima_hooks func, int mask, int flags, int *pcr, +int ima_match_policy(struct inode *inode, const struct cred *cred, + struct lsmblob *blob, enum ima_hooks func, int mask, + int flags, int *pcr, struct ima_template_desc **template_desc); void ima_init_policy(void); void ima_update_policy(void); diff --git a/security/integrity/ima/ima_api.c b/security/integrity/ima/ima_api.c index 610759fe63b8..1ab769fa7df6 100644 --- a/security/integrity/ima/ima_api.c +++ b/security/integrity/ima/ima_api.c @@ -163,7 +163,7 @@ void ima_add_violation(struct file *file, const unsigned char *filename, * ima_get_action - appraise & measure decision based on policy. * @inode: pointer to inode to measure * @cred: pointer to credentials structure to validate - * @secid: secid of the task being validated + * @blob: LSM data of the task being validated * @mask: contains the permission mask (MAY_READ, MAY_WRITE, MAY_EXEC, * MAY_APPEND) * @func: caller identifier @@ -181,15 +181,15 @@ void ima_add_violation(struct file *file, const unsigned char *filename, * Returns IMA_MEASURE, IMA_APPRAISE mask. * */ -int ima_get_action(struct inode *inode, const struct cred *cred, u32 secid, - int mask, enum ima_hooks func, int *pcr, - struct ima_template_desc **template_desc) +int ima_get_action(struct inode *inode, const struct cred *cred, + struct lsmblob *blob, int mask, enum ima_hooks func, + int *pcr, struct ima_template_desc **template_desc) { int flags = IMA_MEASURE | IMA_AUDIT | IMA_APPRAISE | IMA_HASH; flags &= ima_policy_flag; - return ima_match_policy(inode, cred, secid, func, mask, flags, pcr, + return ima_match_policy(inode, cred, blob, func, mask, flags, pcr, template_desc); } diff --git a/security/integrity/ima/ima_appraise.c b/security/integrity/ima/ima_appraise.c index 37f540af45bb..01c755a242ac 100644 --- a/security/integrity/ima/ima_appraise.c +++ b/security/integrity/ima/ima_appraise.c @@ -54,9 +54,8 @@ int ima_must_appraise(struct inode *inode, int mask, enum ima_hooks func) return 0; security_task_getsecid(current, &blob); - /* scaffolding the .secid[0] */ - return ima_match_policy(inode, current_cred(), blob.secid[0], func, - mask, IMA_APPRAISE | IMA_HASH, NULL, NULL); + return ima_match_policy(inode, current_cred(), &blob, func, mask, + IMA_APPRAISE | IMA_HASH, NULL, NULL); } static int ima_fix_xattr(struct dentry *dentry, diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c index c8e3e234d446..86cc1419587e 100644 --- a/security/integrity/ima/ima_main.c +++ b/security/integrity/ima/ima_main.c @@ -190,8 +190,8 @@ void ima_file_free(struct file *file) } static int process_measurement(struct file *file, const struct cred *cred, - u32 secid, char *buf, loff_t size, int mask, - enum ima_hooks func) + struct lsmblob *blob, char *buf, loff_t size, + int mask, enum ima_hooks func) { struct inode *inode = file_inode(file); struct integrity_iint_cache *iint = NULL; @@ -214,7 +214,7 @@ static int process_measurement(struct file *file, const struct cred *cred, * bitmask based on the appraise/audit/measurement policy. * Included is the appraise submask. */ - action = ima_get_action(inode, cred, secid, mask, func, &pcr, + action = ima_get_action(inode, cred, blob, mask, func, &pcr, &template_desc); violation_check = ((func == FILE_CHECK || func == MMAP_CHECK) && (ima_policy_flag & IMA_MEASURE)); @@ -388,8 +388,7 @@ int ima_file_mmap(struct file *file, unsigned long prot) if (file && (prot & PROT_EXEC)) { security_task_getsecid(current, &blob); - /* scaffolding - until process_measurement changes */ - return process_measurement(file, current_cred(), blob.secid[0], + return process_measurement(file, current_cred(), &blob, NULL, 0, MAY_EXEC, MMAP_CHECK); } @@ -415,16 +414,14 @@ int ima_bprm_check(struct linux_binprm *bprm) struct lsmblob blob; 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); + ret = process_measurement(bprm->file, current_cred(), &blob, NULL, 0, + MAY_EXEC, BPRM_CHECK); if (ret) return ret; security_cred_getsecid(bprm->cred, &blob); - /* scaffolding until process_measurement changes */ - return process_measurement(bprm->file, bprm->cred, blob.secid[0], - NULL, 0, MAY_EXEC, CREDS_CHECK); + return process_measurement(bprm->file, bprm->cred, &blob, NULL, 0, + MAY_EXEC, CREDS_CHECK); } /** @@ -442,8 +439,7 @@ int ima_file_check(struct file *file, int mask) struct lsmblob blob; security_task_getsecid(current, &blob); - /* scaffolding until process_measurement changes */ - return process_measurement(file, current_cred(), blob.secid[0], NULL, 0, + return process_measurement(file, current_cred(), &blob, NULL, 0, mask & (MAY_READ | MAY_WRITE | MAY_EXEC | MAY_APPEND), FILE_CHECK); } @@ -575,9 +571,8 @@ int ima_post_read_file(struct file *file, void *buf, loff_t size, func = read_idmap[read_id] ?: FILE_CHECK; security_task_getsecid(current, &blob); - /* scaffolding until process_measurement changes */ - return process_measurement(file, current_cred(), blob.secid[0], buf, - size, MAY_READ, func); + return process_measurement(file, current_cred(), &blob, buf, size, + MAY_READ, func); } /** @@ -669,9 +664,8 @@ void process_buffer_measurement(const void *buf, int size, */ if (func) { security_task_getsecid(current, &blob); - /* scaffolding */ - action = ima_get_action(NULL, current_cred(), blob.secid[0], - 0, func, &pcr, &template); + action = ima_get_action(NULL, current_cred(), &blob, 0, func, + &pcr, &template); if (!(action & IMA_MEASURE)) return; } diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c index 6771c8c83105..227993b8422d 100644 --- a/security/integrity/ima/ima_policy.c +++ b/security/integrity/ima/ima_policy.c @@ -380,7 +380,7 @@ int ima_lsm_policy_change(struct notifier_block *nb, unsigned long event, * Returns true on rule match, false on failure. */ static bool ima_match_rules(struct ima_rule_entry *rule, struct inode *inode, - const struct cred *cred, u32 secid, + const struct cred *cred, struct lsmblob *blob, enum ima_hooks func, int mask) { int i; @@ -443,7 +443,6 @@ static bool ima_match_rules(struct ima_rule_entry *rule, struct inode *inode, case LSM_SUBJ_USER: case LSM_SUBJ_ROLE: case LSM_SUBJ_TYPE: - lsmblob_init(&blob, secid); rc = security_filter_rule_match(&blob, rule->lsm[i].type, Audit_equal, @@ -487,7 +486,7 @@ static int get_subaction(struct ima_rule_entry *rule, enum ima_hooks func) * @inode: pointer to an inode for which the policy decision is being made * @cred: pointer to a credentials structure for which the policy decision is * being made - * @secid: LSM secid of the task to be validated + * @blob: LSM data of the task to be validated * @func: IMA hook identifier * @mask: requested action (MAY_READ | MAY_WRITE | MAY_APPEND | MAY_EXEC) * @pcr: set the pcr to extend @@ -500,8 +499,9 @@ static int get_subaction(struct ima_rule_entry *rule, enum ima_hooks func) * list when walking it. Reads are many orders of magnitude more numerous * than writes so ima_match_policy() is classical RCU candidate. */ -int ima_match_policy(struct inode *inode, const struct cred *cred, u32 secid, - enum ima_hooks func, int mask, int flags, int *pcr, +int ima_match_policy(struct inode *inode, const struct cred *cred, + struct lsmblob *blob, enum ima_hooks func, int mask, + int flags, int *pcr, struct ima_template_desc **template_desc) { struct ima_rule_entry *entry; @@ -516,7 +516,7 @@ int ima_match_policy(struct inode *inode, const struct cred *cred, u32 secid, if (!(entry->action & actmask)) continue; - if (!ima_match_rules(entry, inode, cred, secid, func, mask)) + if (!ima_match_rules(entry, inode, cred, blob, func, mask)) continue; action |= entry->flags & IMA_ACTION_FLAGS; -- 2.24.1