* [PATCH] ima: fix up #endif comments
@ 2017-05-05 17:15 Tycho Andersen
2017-05-05 19:52 ` Mimi Zohar
0 siblings, 1 reply; 2+ messages in thread
From: Tycho Andersen @ 2017-05-05 17:15 UTC (permalink / raw)
To: Mimi Zohar, Dmitry Kasatkin; +Cc: linux-ima-devel, linux-kernel, Tycho Andersen
While reading the code, I noticed that these #endif comments don't match
how they're actually nested. This patch fixes that.
Signed-off-by: Tycho Andersen <tycho@docker.com>
---
security/integrity/ima/ima.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
index b563fbd4d122..d26a30e37d13 100644
--- a/security/integrity/ima/ima.h
+++ b/security/integrity/ima/ima.h
@@ -306,12 +306,12 @@ static inline int security_filter_rule_match(u32 secid, u32 field, u32 op,
{
return -EINVAL;
}
-#endif /* CONFIG_IMA_TRUSTED_KEYRING */
+#endif /* CONFIG_IMA_LSM_RULES */
#ifdef CONFIG_IMA_READ_POLICY
#define POLICY_FILE_FLAGS (S_IWUSR | S_IRUSR)
#else
#define POLICY_FILE_FLAGS S_IWUSR
-#endif /* CONFIG_IMA_WRITE_POLICY */
+#endif /* CONFIG_IMA_READ_POLICY */
#endif /* __LINUX_IMA_H */
--
2.11.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ima: fix up #endif comments
2017-05-05 17:15 [PATCH] ima: fix up #endif comments Tycho Andersen
@ 2017-05-05 19:52 ` Mimi Zohar
0 siblings, 0 replies; 2+ messages in thread
From: Mimi Zohar @ 2017-05-05 19:52 UTC (permalink / raw)
To: Tycho Andersen, Dmitry Kasatkin; +Cc: linux-ima-devel, linux-kernel
On Fri, 2017-05-05 at 11:15 -0600, Tycho Andersen wrote:
> While reading the code, I noticed that these #endif comments don't match
> how they're actually nested. This patch fixes that.
>
> Signed-off-by: Tycho Andersen <tycho@docker.com>
Thanks!
Mimi
> ---
> security/integrity/ima/ima.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
> index b563fbd4d122..d26a30e37d13 100644
> --- a/security/integrity/ima/ima.h
> +++ b/security/integrity/ima/ima.h
> @@ -306,12 +306,12 @@ static inline int security_filter_rule_match(u32 secid, u32 field, u32 op,
> {
> return -EINVAL;
> }
> -#endif /* CONFIG_IMA_TRUSTED_KEYRING */
> +#endif /* CONFIG_IMA_LSM_RULES */
>
> #ifdef CONFIG_IMA_READ_POLICY
> #define POLICY_FILE_FLAGS (S_IWUSR | S_IRUSR)
> #else
> #define POLICY_FILE_FLAGS S_IWUSR
> -#endif /* CONFIG_IMA_WRITE_POLICY */
> +#endif /* CONFIG_IMA_READ_POLICY */
>
> #endif /* __LINUX_IMA_H */
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-05-05 19:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-05 17:15 [PATCH] ima: fix up #endif comments Tycho Andersen
2017-05-05 19:52 ` Mimi Zohar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).