| From foo@baz Thu Nov 9 09:48:01 CET 2017 |
| From: John Johansen <john.johansen@canonical.com> |
| Date: Mon, 16 Jan 2017 13:21:27 -0800 |
| Subject: apparmor: fix undefined reference to `aa_g_hash_policy' |
| |
| From: John Johansen <john.johansen@canonical.com> |
| |
| |
| [ Upstream commit 3ccb76c5dfe0d25c1d0168d5b726d0b43d19a485 ] |
| |
| The kernel build bot turned up a bad config combination when |
| CONFIG_SECURITY_APPARMOR is y and CONFIG_SECURITY_APPARMOR_HASH is n, |
| resulting in the build error |
| security/built-in.o: In function `aa_unpack': |
| (.text+0x841e2): undefined reference to `aa_g_hash_policy' |
| |
| Signed-off-by: John Johansen <john.johansen@canonical.com> |
| Signed-off-by: Sasha Levin <alexander.levin@verizon.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| security/apparmor/lsm.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/security/apparmor/lsm.c |
| +++ b/security/apparmor/lsm.c |
| @@ -671,9 +671,9 @@ enum profile_mode aa_g_profile_mode = AP |
| module_param_call(mode, param_set_mode, param_get_mode, |
| &aa_g_profile_mode, S_IRUSR | S_IWUSR); |
| |
| -#ifdef CONFIG_SECURITY_APPARMOR_HASH |
| /* whether policy verification hashing is enabled */ |
| bool aa_g_hash_policy = IS_ENABLED(CONFIG_SECURITY_APPARMOR_HASH_DEFAULT); |
| +#ifdef CONFIG_SECURITY_APPARMOR_HASH |
| module_param_named(hash_policy, aa_g_hash_policy, aabool, S_IRUSR | S_IWUSR); |
| #endif |
| |
