mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-20 10:44:23 +08:00
7616ac70d1
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: 6059f71f1e ("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>
99 lines
2.1 KiB
C
99 lines
2.1 KiB
C
/*
|
|
* AppArmor security module
|
|
*
|
|
* This file contains AppArmor policy loading interface function definitions.
|
|
*
|
|
* Copyright 2013 Canonical Ltd.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation, version 2 of the
|
|
* License.
|
|
*
|
|
* Fns to provide a checksum of policy that has been loaded this can be
|
|
* compared to userspace policy compiles to check loaded policy is what
|
|
* it should be.
|
|
*/
|
|
|
|
#include <crypto/hash.h>
|
|
|
|
#include "include/apparmor.h"
|
|
#include "include/crypto.h"
|
|
|
|
static unsigned int apparmor_hash_size;
|
|
|
|
static struct crypto_shash *apparmor_tfm;
|
|
|
|
unsigned int aa_hash_size(void)
|
|
{
|
|
return apparmor_hash_size;
|
|
}
|
|
|
|
int aa_calc_profile_hash(struct aa_profile *profile, u32 version, void *start,
|
|
size_t len)
|
|
{
|
|
struct {
|
|
struct shash_desc shash;
|
|
char ctx[crypto_shash_descsize(apparmor_tfm)];
|
|
} desc;
|
|
int error = -ENOMEM;
|
|
u32 le32_version = cpu_to_le32(version);
|
|
|
|
if (!aa_g_hash_policy)
|
|
return 0;
|
|
|
|
if (!apparmor_tfm)
|
|
return 0;
|
|
|
|
profile->hash = kzalloc(apparmor_hash_size, GFP_KERNEL);
|
|
if (!profile->hash)
|
|
goto fail;
|
|
|
|
desc.shash.tfm = apparmor_tfm;
|
|
desc.shash.flags = 0;
|
|
|
|
error = crypto_shash_init(&desc.shash);
|
|
if (error)
|
|
goto fail;
|
|
error = crypto_shash_update(&desc.shash, (u8 *) &le32_version, 4);
|
|
if (error)
|
|
goto fail;
|
|
error = crypto_shash_update(&desc.shash, (u8 *) start, len);
|
|
if (error)
|
|
goto fail;
|
|
error = crypto_shash_final(&desc.shash, profile->hash);
|
|
if (error)
|
|
goto fail;
|
|
|
|
return 0;
|
|
|
|
fail:
|
|
kfree(profile->hash);
|
|
profile->hash = NULL;
|
|
|
|
return error;
|
|
}
|
|
|
|
static int __init init_profile_hash(void)
|
|
{
|
|
struct crypto_shash *tfm;
|
|
|
|
if (!apparmor_initialized)
|
|
return 0;
|
|
|
|
tfm = crypto_alloc_shash("sha1", 0, CRYPTO_ALG_ASYNC);
|
|
if (IS_ERR(tfm)) {
|
|
int error = PTR_ERR(tfm);
|
|
AA_ERROR("failed to setup profile sha1 hashing: %d\n", error);
|
|
return error;
|
|
}
|
|
apparmor_tfm = tfm;
|
|
apparmor_hash_size = crypto_shash_digestsize(apparmor_tfm);
|
|
|
|
aa_info_message("AppArmor sha1 policy hashing enabled");
|
|
|
|
return 0;
|
|
}
|
|
|
|
late_initcall(init_profile_hash);
|