2022-07-20 12:52:14

by Lukas Bulwahn

Subject: [PATCH] apparmor: correct config reference to intended one

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 <[email protected]>
---
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

2022-07-20 20:38:04

by John Johansen

Subject: Re: [PATCH] apparmor: correct config reference to intended one

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 <[email protected]>

thanks, I have pulled this into apparmor-next

Acked-by: John Johansen <[email protected]>

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