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

Commit fe7e96f6 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:
  APPARMOR: Fix memory leak of apparmor_init()
  APPARMOR: Fix memory leak of alloc_namespace()
parents 0f90933c a26d279e

security/apparmor/lsm.c

+4 −2
Original line number Diff line number Diff line
@@ -922,7 +922,7 @@ static int __init apparmor_init(void) 
	error = register_security(&apparmor_ops);

	if (error) {

		AA_ERROR("Unable to register AppArmor\n");

		goto register_security_out;

		goto set_init_cxt_out;

	}



	/* Report that AppArmor successfully initialized */
@@ -936,6 +936,9 @@ static int __init apparmor_init(void) 


	return error;



set_init_cxt_out:

	aa_free_task_context(current->real_cred->security);



register_security_out:

	aa_free_root_ns();
@@ -944,7 +947,6 @@ static int __init apparmor_init(void) 


	apparmor_enabled = 0;

	return error;



}



security_initcall(apparmor_init);

security/apparmor/policy.c

+1 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ static struct aa_namespace *alloc_namespace(const char *prefix, 
	return ns;



fail_unconfined:

	kzfree(ns->base.name);

	kzfree(ns->base.hname);

fail_ns:

	kzfree(ns);

	return NULL;