From patchwork Wed Nov 27 21:37:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Casey Schaufler X-Patchwork-Id: 11264951 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C3D4B112B for ; Wed, 27 Nov 2019 21:38:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8F980215A5 for ; Wed, 27 Nov 2019 21:38:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=yahoo.com header.i=@yahoo.com header.b="mKjmKl3c" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727730AbfK0ViG (ORCPT ); Wed, 27 Nov 2019 16:38:06 -0500 Received: from sonic313-15.consmr.mail.ne1.yahoo.com ([66.163.185.38]:40542 "EHLO sonic313-15.consmr.mail.ne1.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728277AbfK0ViG (ORCPT ); Wed, 27 Nov 2019 16:38:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1574890683; bh=pLpnfhGC5ZOpRq2QHZh6IehZUDJvqR6WKLLKoGhzkHM=; h=From:To:Subject:Date:In-Reply-To:References:From:Subject; b=mKjmKl3c9S8LELq2k8piIxD2az+88mev4JFa7bvlyq1uG5CmgZgv0OkD37OXDdVhdOqAkUXfUjtWxGUY/+Q4+Tpkx/emOZorqaku/WIdYDM7Kc4EuLhPjeycdQvnbNGA6XjTax2VuEie3jfNqbaxAR/Z4kzpAVtm1O5jx3sp/FMMYzpteG80za6P4Dbr2V8HsxDodGr+7cSzZ2Jv8Nb23jm83rFNh6LzPmPcDf6N3f4oxUhnWSJys4oAbSZG+mkF8rFiBtdyUe9sfa+snUEhWBzE7leI3RDfsKD8aMOHlN+SXvWoVAFJjScUEYBxNcIHq7VCgixhA7AoYkWovxW3LQ== X-YMail-OSG: FwG7kaIVM1kRo3woKJE1myGTOuhq4guI3yy7cppCvQUVea46ZHs3LSNcs2hrUIv yReqxOkT1VwWF706_9SgjgabYWj00.nowdRWAD7bpbaUwbDBGC2e7vR5xriem9kkJPqWN4c56Wae s2bZ_KAvuds0GZ8cHLvvyeR4StLq.Di.hhVVpK92KteJkTGjzYzMaJdiqn4aOwvBKJlMZhzUWUCY dTkYapNDmjoGBhGUmkFE9JiVu7yK15aDCoK2pRetespvmoh.G5fh1XSoXYNUcg3_A_vK6KWO9xyo aTJV87EmJYVLDf9atzdYVb4tBbl_U7CnQ_Deg8_dV3QWlwciGO8rRjBsPw2BSuAWK8LxDWz7adoM Ld77tbNY.ccAqVvKPxOzlcTHr_6FsZg_OR04z.MENPj11lyVrQ7uf9ZBuaDpV6F36Nt5yvyF6V84 mPPCjUn3S4eIjPv655qod.iJxMjEUPikHiqeZJ1IZHbult6kttA8bgirsDgTfWxLQqQ.MpCEaDpq w6eaoK2K9C.WSlKV6r02Ca0v7CVpSLqHZFn_6jKcFQcYh5tJBlWhZoKVFylqRLmSyWuImDyCIfDj MA6mvmGoWu6MnoW.q0Gs33tMilHMEbUaeDgkQVjvXDbO_VRw_8XdYWbDEwQ7bJH38GZBAr7iO29i 0I7.lPmb27pdadmOD9jOpdLPClgJdhx_Vwdm1t37v2HwVsGNsu057QRc6kcylPHgwjkmqwsvnExm uJjRxkVytm1ljJEXur1Szk9p1RHouaibUTDmn39GxsTmv3uNkog7B94QedNFdPOfwt9Mtj.g2Bn1 R7EwVSHtLwXyClEgE.P5dEunD9h5HSVyrmMvo1oFj_iqPXAa2UJ89C1QfJMptUWqGU7UAjY5JOqM BPpBNQpedfUqm8zx7g33Ap5Mmmcs7lhFhe2kSVw.ycNUbvLFjIsPkz4AuC0kokNvoKtXr3ltzopk kIDRuSapheqsZGKLzoIumqTCGVppyyz3sXYCUv4C3HdzRUPOcN_HFScfTcdSHVWn6CJVt9ZWqcLK uLMNoSe6j.kkn0lTbn3N9GL1kFiZRjGSKx7yc5Ekp9H7jGu2EjjnRvSsnKN7BqnMM3iSQbFMmFan vGH9rAdNZqGyftAIeBh68c5u0rEV6YG3TWH5fxno4H2F5IChQq9QeMOvzceXSRX1.9YfjGJQ_mB_ ExPaJKLbGbSQpWF.mRAOVPgvy0b28H_gi_f9ccLAzSMjjIx2ku.lzo0tE4pdgx9s5D.4EuQ2bXAn KXUiBaq3ZLHi85j.ynDd7wxO8E_sSBokAm._ZWdQ0Ls9qpguhx4g3HhvQQAQmOT1Uu6Dx.dh8aI3 _XWmVrdln8SRT7TEXAWqLEgM5zsD5mxF6yO7mYQ6KgkyNyRp99VHh99uYc7.lDc8Uoiu.OM8U.Wj mOBKNHdCn0cLoYZV_eNZRacPki7z.YRmr6PIyp6cQIMxZbm.GFWk- Received: from sonic.gate.mail.ne1.yahoo.com by sonic313.consmr.mail.ne1.yahoo.com with HTTP; Wed, 27 Nov 2019 21:38:03 +0000 Received: by smtp406.mail.bf1.yahoo.com (Oath Hermes SMTP Server) with ESMTPA ID 2c2d0f9121a87dc46718f3aa46e4610a; Wed, 27 Nov 2019 21:37:58 +0000 (UTC) From: Casey Schaufler To: linux-integrity@vger.kernel.org, zohar@linux.ibm.com Subject: [v11-ima PATCH 12/25] IMA: Change internal interfaces to use lsmblobs Date: Wed, 27 Nov 2019 13:37:05 -0800 Message-Id: <20191127213718.18267-13-casey@schaufler-ca.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191127213718.18267-1-casey@schaufler-ca.com> References: <20191127213718.18267-1-casey@schaufler-ca.com> MIME-Version: 1.0 Sender: linux-integrity-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-integrity@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 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 | 4 +--- security/integrity/ima/ima_main.c | 29 +++++++++++---------------- security/integrity/ima/ima_policy.c | 12 +++++------ 5 files changed, 30 insertions(+), 36 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 69e549164949..01c755a242ac 100644 --- a/security/integrity/ima/ima_appraise.c +++ b/security/integrity/ima/ima_appraise.c @@ -48,15 +48,13 @@ bool is_ima_appraise_enabled(void) */ int ima_must_appraise(struct inode *inode, int mask, enum ima_hooks func) { - u32 secid; struct lsmblob blob; if (!ima_appraise) return 0; security_task_getsecid(current, &blob); - lsmblob_secid(&blob, &secid); - return ima_match_policy(inode, current_cred(), secid, func, mask, + return ima_match_policy(inode, current_cred(), &blob, func, mask, IMA_APPRAISE | IMA_HASH, NULL, NULL); } diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c index 4f55d1bcf3fb..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,7 +664,7 @@ void process_buffer_measurement(const void *buf, int size, */ if (func) { security_task_getsecid(current, &blob); - action = ima_get_action(NULL, current_cred(), blob.secid[0], 0, func, + 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 c7d2ea47a326..b089d4a8b27b 100644 --- a/security/integrity/ima/ima_policy.c +++ b/security/integrity/ima/ima_policy.c @@ -368,7 +368,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; @@ -431,7 +431,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, @@ -475,7 +474,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 @@ -488,8 +487,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; @@ -504,7 +504,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;