• Arnd Bergmann's avatar
    apparmor: fix SECURITY_APPARMOR_HASH_DEFAULT parameter handling · 7616ac70
    Arnd Bergmann authored
    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: default avatarArnd Bergmann <arnd@arndb.de>
    Fixes: 6059f71f ("apparmor: add parameter to control whether policy hashing is used")
    Signed-off-by: default avatarJohn Johansen <john.johansen@canonical.com>
    Signed-off-by: default avatarJames Morris <james.l.morris@oracle.com>
    7616ac70
policy_unpack.c 19.1 KB