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

Commit e6f901bb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of... 

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  ima: always maintain counters
  AppArmor: Fix locking from removal of profile namespace
  AppArmor: Fix splitting an fqname into separate namespace and profile names
  AppArmor: Fix security_task_setrlimit logic for 2.6.36 changes
  AppArmor: Drop hack to remove appended " (deleted)" string
parents d56557af e950598d

security/apparmor/include/resource.h

+2 −2
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ struct aa_rlimit { 
};



int aa_map_resource(int resource);

int aa_task_setrlimit(struct aa_profile *profile, unsigned int resource,

		      struct rlimit *new_rlim);

int aa_task_setrlimit(struct aa_profile *profile, struct task_struct *,

		      unsigned int resource, struct rlimit *new_rlim);



void __aa_transition_rlimits(struct aa_profile *old, struct aa_profile *new);

security/apparmor/lib.c

+1 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ char *aa_split_fqname(char *fqname, char **ns_name) 
	*ns_name = NULL;

	if (name[0] == ':') {

		char *split = strchr(&name[1], ':');

		*ns_name = skip_spaces(&name[1]);

		if (split) {

			/* overwrite ':' with \0 */

			*split = 0;
@@ -47,7 +48,6 @@ char *aa_split_fqname(char *fqname, char **ns_name) 
		} else

			/* a ns name without a following profile is allowed */

			name = NULL;

		*ns_name = &name[1];

	}

	if (name && *name == 0)

		name = NULL;

security/apparmor/lsm.c

+1 −1
Original line number Diff line number Diff line
@@ -614,7 +614,7 @@ static int apparmor_task_setrlimit(struct task_struct *task, 
	int error = 0;



	if (!unconfined(profile))

		error = aa_task_setrlimit(profile, resource, new_rlim);

		error = aa_task_setrlimit(profile, task, resource, new_rlim);



	return error;

}

security/apparmor/path.c

+11 −27
Original line number Diff line number Diff line
@@ -59,8 +59,7 @@ static int d_namespace_path(struct path *path, char *buf, int buflen, 
{

	struct path root, tmp;

	char *res;

	int deleted, connected;

	int error = 0;

	int connected, error = 0;



	/* Get the root we want to resolve too, released below */

	if (flags & PATH_CHROOT_REL) {
@@ -74,19 +73,8 @@ static int d_namespace_path(struct path *path, char *buf, int buflen, 
	}



	spin_lock(&dcache_lock);

	/* There is a race window between path lookup here and the

	 * need to strip the " (deleted) string that __d_path applies

	 * Detect the race and relookup the path

	 *

	 * The stripping of (deleted) is a hack that could be removed

	 * with an updated __d_path

	 */

	do {

	tmp = root;

		deleted = d_unlinked(path->dentry);

	res = __d_path(path, &tmp, buf, buflen);



	} while (deleted != d_unlinked(path->dentry));

	spin_unlock(&dcache_lock);



	*name = res;
@@ -98,22 +86,18 @@ static int d_namespace_path(struct path *path, char *buf, int buflen, 
		*name = buf;

		goto out;

	}

	if (deleted) {

		/* On some filesystems, newly allocated dentries appear to the

		 * security_path hooks as a deleted dentry except without an

		 * inode allocated.

		 *

		 * Remove the appended deleted text and return as string for

		 * normal mediation, or auditing.  The (deleted) string is

		 * guaranteed to be added in this case, so just strip it.

		 */

		buf[buflen - 11] = 0;	/* - (len(" (deleted)") +\0) */



		if (path->dentry->d_inode && !(flags & PATH_MEDIATE_DELETED)) {

	/* Handle two cases:

	 * 1. A deleted dentry && profile is not allowing mediation of deleted

	 * 2. On some filesystems, newly allocated dentries appear to the

	 *    security_path hooks as a deleted dentry except without an inode

	 *    allocated.

	 */

	if (d_unlinked(path->dentry) && path->dentry->d_inode &&

	    !(flags & PATH_MEDIATE_DELETED)) {

			error = -ENOENT;

			goto out;

	}

	}



	/* Determine if the path is connected to the expected root */

	connected = tmp.dentry == root.dentry && tmp.mnt == root.mnt;

security/apparmor/policy.c

+4 −2
Original line number Diff line number Diff line
@@ -1151,12 +1151,14 @@ ssize_t aa_remove_profiles(char *fqname, size_t size) 
		/* released below */

		ns = aa_get_namespace(root);



	write_lock(&ns->lock);

	if (!name) {

		/* remove namespace - can only happen if fqname[0] == ':' */

		write_lock(&ns->parent->lock);

		__remove_namespace(ns);

		write_unlock(&ns->parent->lock);

	} else {

		/* remove profile */

		write_lock(&ns->lock);

		profile = aa_get_profile(__lookup_profile(&ns->base, name));

		if (!profile) {

			error = -ENOENT;
@@ -1165,8 +1167,8 @@ ssize_t aa_remove_profiles(char *fqname, size_t size) 
		}

		name = profile->base.hname;

		__remove_profile(profile);

	}

		write_unlock(&ns->lock);

	}



	/* don't fail removal if audit fails */

	(void) audit_policy(OP_PROF_RM, GFP_KERNEL, name, info, error);