Commit 7cbe1135 authored by Paul Moore's avatar Paul Moore
Browse files

apparmor: move initcalls to the LSM framework 



Reviewed-by: default avatarKees Cook <kees@kernel.org>
Acked-by: default avatarJohn Johansen <john.johansen@canonical.com>
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent d3ba8f80

security/apparmor/apparmorfs.c

+1 −3
Original line number Diff line number Diff line
@@ -2649,7 +2649,7 @@ static const struct inode_operations policy_link_iops = { 
 *

 * Returns: error on failure

 */

static int __init aa_create_aafs(void)

int __init aa_create_aafs(void)

{

	struct dentry *dent;

	int error;
@@ -2728,5 +2728,3 @@ static int __init aa_create_aafs(void) 
	AA_ERROR("Error creating AppArmor securityfs\n");

	return error;

}
 


fs_initcall(aa_create_aafs);

security/apparmor/crypto.c

+1 −2
Original line number Diff line number Diff line
@@ -53,10 +53,9 @@ int aa_calc_profile_hash(struct aa_profile *profile, u32 version, void *start, 
	return 0;

}



static int __init init_profile_hash(void)

int __init init_profile_hash(void)

{

	if (apparmor_initialized)

		aa_info_message("AppArmor sha256 policy hashing enabled");

	return 0;

}
 
late_initcall(init_profile_hash);

security/apparmor/include/apparmorfs.h

+2 −0
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@ enum aafs_prof_type { 
#define prof_dir(X) ((X)->dents[AAFS_PROF_DIR])

#define prof_child_dir(X) ((X)->dents[AAFS_PROF_PROFS])



int aa_create_aafs(void);



void __aa_bump_ns_revision(struct aa_ns *ns);

void __aafs_profile_rmdir(struct aa_profile *profile);

void __aafs_profile_migrate_dents(struct aa_profile *old,

security/apparmor/include/crypto.h

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include "policy.h"



#ifdef CONFIG_SECURITY_APPARMOR_HASH

int init_profile_hash(void);

unsigned int aa_hash_size(void);

char *aa_calc_hash(void *data, size_t len);

int aa_calc_profile_hash(struct aa_profile *profile, u32 version, void *start,

security/apparmor/lsm.c

+8 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include "include/audit.h"

#include "include/capability.h"

#include "include/cred.h"

#include "include/crypto.h"

#include "include/file.h"

#include "include/ipc.h"

#include "include/net.h"
@@ -2426,7 +2427,6 @@ static int __init apparmor_nf_ip_init(void) 


	return 0;

}

__initcall(apparmor_nf_ip_init);

#endif



static char nulldfa_src[] __aligned(8) = {
@@ -2560,4 +2560,11 @@ DEFINE_LSM(apparmor) = { 
	.enabled = &apparmor_enabled,

	.blobs = &apparmor_blob_sizes,

	.init = apparmor_init,

	.initcall_fs = aa_create_aafs,

#if defined(CONFIG_NETFILTER) && defined(CONFIG_NETWORK_SECMARK)

	.initcall_device = apparmor_nf_ip_init,

#endif

#ifdef CONFIG_SECURITY_APPARMOR_HASH

	.initcall_late = init_profile_hash,

#endif

};