Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c961ee5f authored by John Johansen's avatar John Johansen
Browse files

apparmor: convert from securityfs to apparmorfs for policy ns files 



Virtualize the apparmor policy/ directory so that the current
namespace affects what part of policy is seen. To do this convert to
using apparmorfs for policy namespace files and setup a magic symlink
in the securityfs apparmor dir to access those files.

Signed-off-by: default avatarJohn Johansen <john.johansen@canonical.com>
Reviewed-by: default avatarSeth Arnold <seth.arnold@canonical.com>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
parent 98407f0a

security/apparmor/apparmorfs.c

+37 −26
Original line number Diff line number Diff line
@@ -943,7 +943,7 @@ static void remove_rawdata_dents(struct aa_loaddata *rawdata) 
	for (i = 0; i < AAFS_LOADDATA_NDENTS; i++) {

		if (!IS_ERR_OR_NULL(rawdata->dents[i])) {

			/* no refcounts on i_private */

			securityfs_remove(rawdata->dents[i]);

			aafs_remove(rawdata->dents[i]);

			rawdata->dents[i] = NULL;

		}

	}
@@ -979,33 +979,33 @@ int __aa_fs_create_rawdata(struct aa_ns *ns, struct aa_loaddata *rawdata) 
	if (!rawdata->name)

		return -ENOMEM;



	dir = securityfs_create_dir(rawdata->name, ns_subdata_dir(ns));

	dir = aafs_create_dir(rawdata->name, ns_subdata_dir(ns));

	if (IS_ERR(dir))

		/* ->name freed when rawdata freed */

		return PTR_ERR(dir);

	rawdata->dents[AAFS_LOADDATA_DIR] = dir;



	dent = securityfs_create_file("abi", S_IFREG | 0444, dir, rawdata,

	dent = aafs_create_file("abi", S_IFREG | 0444, dir, rawdata,

				      &seq_rawdata_abi_fops);

	if (IS_ERR(dent))

		goto fail;

	rawdata->dents[AAFS_LOADDATA_ABI] = dent;



	dent = securityfs_create_file("revision", S_IFREG | 0444, dir, rawdata,

	dent = aafs_create_file("revision", S_IFREG | 0444, dir, rawdata,

				      &seq_rawdata_revision_fops);

	if (IS_ERR(dent))

		goto fail;

	rawdata->dents[AAFS_LOADDATA_REVISION] = dent;



	if (aa_g_hash_policy) {

		dent = securityfs_create_file("sha1", S_IFREG | 0444, dir,

		dent = aafs_create_file("sha1", S_IFREG | 0444, dir,

					      rawdata, &seq_rawdata_hash_fops);

		if (IS_ERR(dent))

			goto fail;

		rawdata->dents[AAFS_LOADDATA_HASH] = dent;

	}



	dent = securityfs_create_file("raw_data", S_IFREG | 0444,

	dent = aafs_create_file("raw_data", S_IFREG | 0444,

				      dir, rawdata, &rawdata_fops);

	if (IS_ERR(dent))

		goto fail;
@@ -1047,7 +1047,7 @@ void __aafs_profile_rmdir(struct aa_profile *profile) 
			continue;



		proxy = d_inode(profile->dents[i])->i_private;

		securityfs_remove(profile->dents[i]);

		aafs_remove(profile->dents[i]);

		aa_put_proxy(proxy);

		profile->dents[i] = NULL;

	}
@@ -1077,7 +1077,7 @@ static struct dentry *create_profile_file(struct dentry *dir, const char *name, 
	struct aa_proxy *proxy = aa_get_proxy(profile->proxy);

	struct dentry *dent;



	dent = securityfs_create_file(name, S_IFREG | 0444, dir, proxy, fops);

	dent = aafs_create_file(name, S_IFREG | 0444, dir, proxy, fops);

	if (IS_ERR(dent))

		aa_put_proxy(proxy);
@@ -1130,7 +1130,7 @@ int __aafs_profile_mkdir(struct aa_profile *profile, struct dentry *parent) 
		p = aa_deref_parent(profile);

		dent = prof_dir(p);

		/* adding to parent that previously didn't have children */

		dent = securityfs_create_dir("profiles", dent);

		dent = aafs_create_dir("profiles", dent);

		if (IS_ERR(dent))

			goto fail;

		prof_child_dir(p) = parent = dent;
@@ -1151,7 +1151,7 @@ int __aafs_profile_mkdir(struct aa_profile *profile, struct dentry *parent) 
		sprintf(profile->dirname + len, ".%ld", profile->ns->uniq_id++);

	}



	dent = securityfs_create_dir(profile->dirname, parent);

	dent = aafs_create_dir(profile->dirname, parent);

	if (IS_ERR(dent))

		goto fail;

	prof_dir(profile) = dir = dent;
@@ -1190,7 +1190,7 @@ int __aafs_profile_mkdir(struct aa_profile *profile, struct dentry *parent) 
					 profile->rawdata->name, "sha1");

		if (error < 0)

			goto fail2;

		dent = securityfs_create_symlink("raw_sha1", dir, target, NULL);

		dent = aafs_create_symlink("raw_sha1", dir, target, NULL);

		if (IS_ERR(dent))

			goto fail;

		profile->dents[AAFS_PROF_RAW_HASH] = dent;
@@ -1199,7 +1199,7 @@ int __aafs_profile_mkdir(struct aa_profile *profile, struct dentry *parent) 
					 profile->rawdata->name, "abi");

		if (error < 0)

			goto fail2;

		dent = securityfs_create_symlink("raw_abi", dir, target, NULL);

		dent = aafs_create_symlink("raw_abi", dir, target, NULL);

		if (IS_ERR(dent))

			goto fail;

		profile->dents[AAFS_PROF_RAW_ABI] = dent;
@@ -1208,7 +1208,7 @@ int __aafs_profile_mkdir(struct aa_profile *profile, struct dentry *parent) 
					 profile->rawdata->name, "raw_data");

		if (error < 0)

			goto fail2;

		dent = securityfs_create_symlink("raw_data", dir, target, NULL);

		dent = aafs_create_symlink("raw_data", dir, target, NULL);

		if (IS_ERR(dent))

			goto fail;

		profile->dents[AAFS_PROF_RAW_DATA] = dent;
@@ -1283,7 +1283,7 @@ void __aafs_ns_rmdir(struct aa_ns *ns) 
	}



	for (i = AAFS_NS_SIZEOF - 1; i >= 0; --i) {

		securityfs_remove(ns->dents[i]);

		aafs_remove(ns->dents[i]);

		ns->dents[i] = NULL;

	}

}
@@ -1296,38 +1296,38 @@ static int __aafs_ns_mkdir_entries(struct aa_ns *ns, struct dentry *dir) 
	AA_BUG(!ns);

	AA_BUG(!dir);



	dent = securityfs_create_dir("profiles", dir);

	dent = aafs_create_dir("profiles", dir);

	if (IS_ERR(dent))

		return PTR_ERR(dent);

	ns_subprofs_dir(ns) = dent;



	dent = securityfs_create_dir("raw_data", dir);

	dent = aafs_create_dir("raw_data", dir);

	if (IS_ERR(dent))

		return PTR_ERR(dent);

	ns_subdata_dir(ns) = dent;



	dent = securityfs_create_file(".load", 0640, dir, ns,

	dent = aafs_create_file(".load", 0640, dir, ns,

				      &aa_fs_profile_load);

	if (IS_ERR(dent))

		return PTR_ERR(dent);

	aa_get_ns(ns);

	ns_subload(ns) = dent;



	dent = securityfs_create_file(".replace", 0640, dir, ns,

	dent = aafs_create_file(".replace", 0640, dir, ns,

				      &aa_fs_profile_replace);

	if (IS_ERR(dent))

		return PTR_ERR(dent);

	aa_get_ns(ns);

	ns_subreplace(ns) = dent;



	dent = securityfs_create_file(".remove", 0640, dir, ns,

	dent = aafs_create_file(".remove", 0640, dir, ns,

				      &aa_fs_profile_remove);

	if (IS_ERR(dent))

		return PTR_ERR(dent);

	aa_get_ns(ns);

	ns_subremove(ns) = dent;



	dent = securityfs_create_dir("namespaces", dir);

	dent = aafs_create_dir("namespaces", dir);

	if (IS_ERR(dent))

		return PTR_ERR(dent);

	aa_get_ns(ns);
@@ -1354,11 +1354,13 @@ int __aafs_ns_mkdir(struct aa_ns *ns, struct dentry *parent, const char *name, 
	if (!name)

		name = ns->base.name;



	if (!dent) {

		/* create ns dir if it doesn't already exist */

	dent = securityfs_create_dir(name, parent);

		dent = aafs_create_dir(name, parent);

		if (IS_ERR(dent))

			goto fail;



	} else

		dget(dent);

	ns_dir(ns) = dir = dent;

	error = __aafs_ns_mkdir_entries(ns, dir);

	if (error)
@@ -1930,12 +1932,21 @@ static int __init aa_create_aafs(void) 
	ns_subremove(root_ns) = dent;



	mutex_lock(&root_ns->lock);

	error = __aafs_ns_mkdir(root_ns, aa_sfs_entry.dentry, "policy", NULL);

	error = __aafs_ns_mkdir(root_ns, aafs_mnt->mnt_root, ".policy",

				aafs_mnt->mnt_root);

	mutex_unlock(&root_ns->lock);



	if (error)

		goto error;



	/* magic symlink similar to nsfs redirects based on task policy */

	dent = securityfs_create_symlink("policy", aa_sfs_entry.dentry,

					 NULL, &policy_link_iops);

	if (IS_ERR(dent)) {

		error = PTR_ERR(dent);

		goto error;

	}



	error = aa_mk_null_file(aa_sfs_entry.dentry);

	if (error)

		goto error;