From: Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com> To: linux-security-module@vger.kernel.org Cc: linux-ima-devel@lists.sourceforge.net, keyrings@vger.kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Mimi Zohar <zohar@linux.vnet.ibm.com>, Dmitry Kasatkin <dmitry.kasatkin@gmail.com>, David Howells <dhowells@redhat.com>, Herbert Xu <herbert@gondor.apana.org.au>, "David S. Miller" <davem@davemloft.net>, Claudio Carvalho <cclaudio@linux.vnet.ibm.com>, Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com> Subject: [PATCH 3/6] ima: Simplify policy_func_show. Date: Tue, 18 Apr 2017 17:17:43 -0300 [thread overview] Message-ID: <1492546666-16615-4-git-send-email-bauerman@linux.vnet.ibm.com> (raw) In-Reply-To: <1492546666-16615-1-git-send-email-bauerman@linux.vnet.ibm.com> If the func_tokens array uses the same indices as enum ima_hooks, policy_func_show can be a lot simpler, and the func_* enum becomes unnecessary. Signed-off-by: Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com> --- security/integrity/ima/ima_policy.c | 47 ++++++------------------------------- 1 file changed, 7 insertions(+), 40 deletions(-) diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c index cfda5d7b17ec..158eafef64e8 100644 --- a/security/integrity/ima/ima_policy.c +++ b/security/integrity/ima/ima_policy.c @@ -896,20 +896,14 @@ static const char *const mask_tokens[] = { "MAY_APPEND" }; -enum { - func_file = 0, func_mmap, func_bprm, - func_module, func_firmware, func_post, - func_kexec_kernel, func_kexec_initramfs, - func_policy -}; - static const char *const func_tokens[] = { + NULL, "FILE_CHECK", "MMAP_CHECK", "BPRM_CHECK", + "POST_SETATTR", "MODULE_CHECK", "FIRMWARE_CHECK", - "POST_SETATTR", "KEXEC_KERNEL_CHECK", "KEXEC_INITRAMFS_CHECK", "POLICY_CHECK" @@ -949,48 +943,21 @@ void ima_policy_stop(struct seq_file *m, void *v) #define pt(token) policy_tokens[token + Opt_err].pattern #define mt(token) mask_tokens[token] -#define ft(token) func_tokens[token] /* * policy_func_show - display the ima_hooks policy rule */ static void policy_func_show(struct seq_file *m, enum ima_hooks func) { - char tbuf[64] = {0,}; + if (func > 0 && func < MAX_CHECK) + seq_printf(m, pt(Opt_func), func_tokens[func]); + else { + char tbuf[64] = {0,}; - switch (func) { - case FILE_CHECK: - seq_printf(m, pt(Opt_func), ft(func_file)); - break; - case MMAP_CHECK: - seq_printf(m, pt(Opt_func), ft(func_mmap)); - break; - case BPRM_CHECK: - seq_printf(m, pt(Opt_func), ft(func_bprm)); - break; - case MODULE_CHECK: - seq_printf(m, pt(Opt_func), ft(func_module)); - break; - case FIRMWARE_CHECK: - seq_printf(m, pt(Opt_func), ft(func_firmware)); - break; - case POST_SETATTR: - seq_printf(m, pt(Opt_func), ft(func_post)); - break; - case KEXEC_KERNEL_CHECK: - seq_printf(m, pt(Opt_func), ft(func_kexec_kernel)); - break; - case KEXEC_INITRAMFS_CHECK: - seq_printf(m, pt(Opt_func), ft(func_kexec_initramfs)); - break; - case POLICY_CHECK: - seq_printf(m, pt(Opt_func), ft(func_policy)); - break; - default: snprintf(tbuf, sizeof(tbuf), "%d", func); seq_printf(m, pt(Opt_func), tbuf); - break; } + seq_puts(m, " "); } -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: bauerman@linux.vnet.ibm.com (Thiago Jung Bauermann) To: linux-security-module@vger.kernel.org Subject: [PATCH 3/6] ima: Simplify policy_func_show. Date: Tue, 18 Apr 2017 17:17:43 -0300 [thread overview] Message-ID: <1492546666-16615-4-git-send-email-bauerman@linux.vnet.ibm.com> (raw) In-Reply-To: <1492546666-16615-1-git-send-email-bauerman@linux.vnet.ibm.com> If the func_tokens array uses the same indices as enum ima_hooks, policy_func_show can be a lot simpler, and the func_* enum becomes unnecessary. Signed-off-by: Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com> --- security/integrity/ima/ima_policy.c | 47 ++++++------------------------------- 1 file changed, 7 insertions(+), 40 deletions(-) diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c index cfda5d7b17ec..158eafef64e8 100644 --- a/security/integrity/ima/ima_policy.c +++ b/security/integrity/ima/ima_policy.c @@ -896,20 +896,14 @@ static const char *const mask_tokens[] = { "MAY_APPEND" }; -enum { - func_file = 0, func_mmap, func_bprm, - func_module, func_firmware, func_post, - func_kexec_kernel, func_kexec_initramfs, - func_policy -}; - static const char *const func_tokens[] = { + NULL, "FILE_CHECK", "MMAP_CHECK", "BPRM_CHECK", + "POST_SETATTR", "MODULE_CHECK", "FIRMWARE_CHECK", - "POST_SETATTR", "KEXEC_KERNEL_CHECK", "KEXEC_INITRAMFS_CHECK", "POLICY_CHECK" @@ -949,48 +943,21 @@ void ima_policy_stop(struct seq_file *m, void *v) #define pt(token) policy_tokens[token + Opt_err].pattern #define mt(token) mask_tokens[token] -#define ft(token) func_tokens[token] /* * policy_func_show - display the ima_hooks policy rule */ static void policy_func_show(struct seq_file *m, enum ima_hooks func) { - char tbuf[64] = {0,}; + if (func > 0 && func < MAX_CHECK) + seq_printf(m, pt(Opt_func), func_tokens[func]); + else { + char tbuf[64] = {0,}; - switch (func) { - case FILE_CHECK: - seq_printf(m, pt(Opt_func), ft(func_file)); - break; - case MMAP_CHECK: - seq_printf(m, pt(Opt_func), ft(func_mmap)); - break; - case BPRM_CHECK: - seq_printf(m, pt(Opt_func), ft(func_bprm)); - break; - case MODULE_CHECK: - seq_printf(m, pt(Opt_func), ft(func_module)); - break; - case FIRMWARE_CHECK: - seq_printf(m, pt(Opt_func), ft(func_firmware)); - break; - case POST_SETATTR: - seq_printf(m, pt(Opt_func), ft(func_post)); - break; - case KEXEC_KERNEL_CHECK: - seq_printf(m, pt(Opt_func), ft(func_kexec_kernel)); - break; - case KEXEC_INITRAMFS_CHECK: - seq_printf(m, pt(Opt_func), ft(func_kexec_initramfs)); - break; - case POLICY_CHECK: - seq_printf(m, pt(Opt_func), ft(func_policy)); - break; - default: snprintf(tbuf, sizeof(tbuf), "%d", func); seq_printf(m, pt(Opt_func), tbuf); - break; } + seq_puts(m, " "); } -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-security-module" in the body of a message to majordomo at vger.kernel.org More majordomo info@ http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2017-04-18 20:18 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-04-18 20:17 [PATCH 0/6] Appended signatures support for IMA appraisal Thiago Jung Bauermann 2017-04-18 20:17 ` Thiago Jung Bauermann 2017-04-18 20:17 ` [PATCH 1/6] integrity: Small code improvements Thiago Jung Bauermann 2017-04-18 20:17 ` Thiago Jung Bauermann 2017-04-18 20:17 ` [PATCH 2/6] ima: Tidy up constant strings Thiago Jung Bauermann 2017-04-18 20:17 ` Thiago Jung Bauermann 2017-04-18 20:17 ` Thiago Jung Bauermann [this message] 2017-04-18 20:17 ` [PATCH 3/6] ima: Simplify policy_func_show Thiago Jung Bauermann 2017-04-20 12:13 ` Mimi Zohar 2017-04-20 12:13 ` Mimi Zohar 2017-04-20 20:40 ` Thiago Jung Bauermann 2017-04-20 20:40 ` Thiago Jung Bauermann 2017-04-21 13:57 ` Mimi Zohar 2017-04-21 13:57 ` Mimi Zohar 2017-04-24 17:14 ` Thiago Jung Bauermann 2017-04-24 17:14 ` Thiago Jung Bauermann 2017-04-18 20:17 ` [PATCH 4/6] ima: Log the same audit cause whenever a file has no signature Thiago Jung Bauermann 2017-04-18 20:17 ` Thiago Jung Bauermann 2017-04-18 20:17 ` [PATCH 5/6] MODSIGN: Export module signature definitions Thiago Jung Bauermann 2017-04-18 20:17 ` Thiago Jung Bauermann 2017-04-20 12:35 ` Mimi Zohar 2017-04-20 12:35 ` Mimi Zohar 2017-04-20 14:37 ` David Howells 2017-04-20 14:37 ` David Howells 2017-04-20 21:07 ` Thiago Jung Bauermann 2017-04-20 21:07 ` Thiago Jung Bauermann 2017-04-18 20:17 ` [PATCH 6/6] ima: Support appended signatures for appraisal Thiago Jung Bauermann 2017-04-18 20:17 ` Thiago Jung Bauermann 2017-04-20 3:04 ` kbuild test robot 2017-04-20 3:04 ` kbuild test robot 2017-04-20 23:41 ` Thiago Jung Bauermann 2017-04-20 23:41 ` Thiago Jung Bauermann 2017-04-26 22:18 ` Mehmet Kayaalp 2017-04-26 22:18 ` Mehmet Kayaalp 2017-04-27 21:41 ` Thiago Jung Bauermann 2017-04-27 21:41 ` Thiago Jung Bauermann 2017-04-27 22:17 ` Mehmet Kayaalp 2017-04-27 22:17 ` Mehmet Kayaalp 2017-04-26 11:21 ` Mimi Zohar 2017-04-26 11:21 ` Mimi Zohar 2017-04-26 20:40 ` Thiago Jung Bauermann 2017-04-26 20:40 ` Thiago Jung Bauermann
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1492546666-16615-4-git-send-email-bauerman@linux.vnet.ibm.com \ --to=bauerman@linux.vnet.ibm.com \ --cc=cclaudio@linux.vnet.ibm.com \ --cc=davem@davemloft.net \ --cc=dhowells@redhat.com \ --cc=dmitry.kasatkin@gmail.com \ --cc=herbert@gondor.apana.org.au \ --cc=keyrings@vger.kernel.org \ --cc=linux-crypto@vger.kernel.org \ --cc=linux-ima-devel@lists.sourceforge.net \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-security-module@vger.kernel.org \ --cc=zohar@linux.vnet.ibm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.