On Mon, 25 Jul 2016, John Johansen wrote:

> From: Arnd Bergmann <a...@arndb.de>
> 
> 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 <a...@arndb.de>
> Fixes: 6059f71f1e94 ("apparmor: add parameter to control whether policy 
> hashing is used")
> Signed-off-by: John Johansen <john.johan...@canonical.com>

Please rebase this against current Linus.

-- 
James Morris
<jmor...@namei.org>

Reply via email to