summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Johansen <john.johansen@canonical.com>2017-01-16 13:21:27 -0800
committerJohn Johansen <john.johansen@canonical.com>2017-01-16 13:21:27 -0800
commit3ccb76c5dfe0d25c1d0168d5b726d0b43d19a485 (patch)
tree2c06cfff5670bca294c8ed5af4d283408dd694cf
parente6bfa25deb5096c05a08f01e4d6a436dd331fa88 (diff)
downloadblackbird-op-linux-3ccb76c5dfe0d25c1d0168d5b726d0b43d19a485.tar.gz
blackbird-op-linux-3ccb76c5dfe0d25c1d0168d5b726d0b43d19a485.zip
apparmor: fix undefined reference to `aa_g_hash_policy'
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>
-rw-r--r--security/apparmor/lsm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index 0dd48184946a..5217a0a54047 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -677,9 +677,9 @@ enum profile_mode aa_g_profile_mode = APPARMOR_ENFORCE;
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
OpenPOWER on IntegriCloud