diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-07-25 19:59:07 +0200 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2016-07-27 09:39:26 +0200 |
| commit | 7616ac70d1bb4f2e9d25c1a82d283f3368a7b632 (patch) | |
| tree | 1a286fbe8627e9ab580d9bdb7d00833645cb6477 /security/apparmor/crypto.c | |
| parent | tpm: Add TPM 2.0 support to the Nuvoton i2c driver (NPCT6xx family) (diff) | |
| download | linux-7616ac70d1bb4f2e9d25c1a82d283f3368a7b632.tar.xz linux-7616ac70d1bb4f2e9d25c1a82d283f3368a7b632.zip | |
apparmor: fix SECURITY_APPARMOR_HASH_DEFAULT parameter handling
The newly added Kconfig option could never work and just causes a build error
when disabled:
security/apparmor/lsm.c:675:25: error: 'CONFIG_SECURITY_APPARMOR_HASH_DEFAULT' undeclared here (not in a function)
bool aa_g_hash_policy = CONFIG_SECURITY_APPARMOR_HASH_DEFAULT;
The problem is that the macro undefined in this case, and we need to use the IS_ENABLED()
helper to turn it into a boolean constant.
Another minor problem with the original patch is that the option is even offered
in sysfs when SECURITY_APPARMOR_HASH is not enabled, so this also hides the option
in that case.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 6059f71f1e94 ("apparmor: add parameter to control whether policy hashing is used")
Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: James Morris <james.l.morris@oracle.com>
Diffstat (limited to 'security/apparmor/crypto.c')
| -rw-r--r-- | security/apparmor/crypto.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/security/apparmor/crypto.c b/security/apparmor/crypto.c index 532471d0b3a0..b75dab0df1cb 100644 --- a/security/apparmor/crypto.c +++ b/security/apparmor/crypto.c @@ -39,6 +39,9 @@ int aa_calc_profile_hash(struct aa_profile *profile, u32 version, void *start, int error = -ENOMEM; u32 le32_version = cpu_to_le32(version); + if (!aa_g_hash_policy) + return 0; + if (!apparmor_tfm) return 0; |