linux-security-module.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] apparmor: correct config reference to intended one
@ 2022-07-20 12:04 Lukas Bulwahn
  2022-07-20 20:24 ` John Johansen
  0 siblings, 1 reply; 2+ messages in thread
From: Lukas Bulwahn @ 2022-07-20 12:04 UTC (permalink / raw)
  To: John Johansen, Paul Moore, James Morris, Serge E . Hallyn,
	apparmor, linux-security-module
  Cc: kernel-janitors, linux-kernel, Lukas Bulwahn

Commit 5bfcbd22ee4e ("apparmor: Enable tuning of policy paranoid load for
embedded systems") introduces the config SECURITY_APPARMOR_PARANOID_LOAD,
but then refers in the code to SECURITY_PARANOID_LOAD; note the missing
APPARMOR in the middle.

Correct this to the introduced and intended config option.

Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
---
 security/apparmor/lsm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index 090a20805664..e29cade7b662 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -1402,7 +1402,7 @@ module_param_named(path_max, aa_g_path_max, aauint, S_IRUSR);
  * DEPRECATED: read only as strict checking of load is always done now
  * that none root users (user namespaces) can load policy.
  */
-bool aa_g_paranoid_load = IS_ENABLED(CONFIG_SECURITY_PARANOID_LOAD);
+bool aa_g_paranoid_load = IS_ENABLED(CONFIG_SECURITY_APPARMOR_PARANOID_LOAD);
 module_param_named(paranoid_load, aa_g_paranoid_load, aabool, S_IRUGO);
 
 static int param_get_aaintbool(char *buffer, const struct kernel_param *kp);
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] apparmor: correct config reference to intended one
  2022-07-20 12:04 [PATCH] apparmor: correct config reference to intended one Lukas Bulwahn
@ 2022-07-20 20:24 ` John Johansen
  0 siblings, 0 replies; 2+ messages in thread
From: John Johansen @ 2022-07-20 20:24 UTC (permalink / raw)
  To: Lukas Bulwahn, Paul Moore, James Morris, Serge E . Hallyn,
	apparmor, linux-security-module
  Cc: kernel-janitors, linux-kernel

On 7/20/22 05:04, Lukas Bulwahn wrote:
> Commit 5bfcbd22ee4e ("apparmor: Enable tuning of policy paranoid load for
> embedded systems") introduces the config SECURITY_APPARMOR_PARANOID_LOAD,
> but then refers in the code to SECURITY_PARANOID_LOAD; note the missing
> APPARMOR in the middle.
> 
> Correct this to the introduced and intended config option.
> 
> Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>

thanks, I have pulled this into apparmor-next

Acked-by: John Johansen <john.johansen@canonical.com>

> ---
>   security/apparmor/lsm.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
> index 090a20805664..e29cade7b662 100644
> --- a/security/apparmor/lsm.c
> +++ b/security/apparmor/lsm.c
> @@ -1402,7 +1402,7 @@ module_param_named(path_max, aa_g_path_max, aauint, S_IRUSR);
>    * DEPRECATED: read only as strict checking of load is always done now
>    * that none root users (user namespaces) can load policy.
>    */
> -bool aa_g_paranoid_load = IS_ENABLED(CONFIG_SECURITY_PARANOID_LOAD);
> +bool aa_g_paranoid_load = IS_ENABLED(CONFIG_SECURITY_APPARMOR_PARANOID_LOAD);
>   module_param_named(paranoid_load, aa_g_paranoid_load, aabool, S_IRUGO);
>   
>   static int param_get_aaintbool(char *buffer, const struct kernel_param *kp);


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-07-20 20:24 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-20 12:04 [PATCH] apparmor: correct config reference to intended one Lukas Bulwahn
2022-07-20 20:24 ` John Johansen

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).