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

Commit a26d279e authored by wzt.wzt@gmail.com's avatar wzt.wzt@gmail.com Committed by James Morris
Browse files

APPARMOR: Fix memory leak of apparmor_init() 



set_init_cxt() allocted sizeof(struct aa_task_cxt) bytes for cxt,
if register_security() failed, it will cause memory leak.

Signed-off-by: default avatarZhitong Wang <zhitong.wangzt@alibaba-inc.com>
Signed-off-by: default avatarJohn Johansen <john.johansen@canonical.com>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent 246c3fb1

security/apparmor/lsm.c

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

	error = register_security(&apparmor_ops);

	if (error) {

	if (error) {

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

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

		goto register_security_out;

		goto set_init_cxt_out;

	}

	}





	/* Report that AppArmor successfully initialized */

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




	return error;

	return error;





set_init_cxt_out:

	aa_free_task_context(current->real_cred->security);



register_security_out:

register_security_out:

	aa_free_root_ns();

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




	apparmor_enabled = 0;

	apparmor_enabled = 0;

	return error;

	return error;



}

}





security_initcall(apparmor_init);
 
security_initcall(apparmor_init);