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

Commit 9b7c4488 authored by GUO Zihua's avatar GUO Zihua Committed by Greg Kroah-Hartman
Browse files

integrity: Fix memory leakage in keyring allocation error path 



[ Upstream commit 39419ef7af0916cc3620ecf1ed42d29659109bf3 ]

Key restriction is allocated in integrity_init_keyring(). However, if
keyring allocation failed, it is not freed, causing memory leaks.

Fixes: 2b6aa412 ("KEYS: Use structure to capture key restriction function and data")
Signed-off-by: default avatarGUO Zihua <guozihua@huawei.com>
Signed-off-by: default avatarMimi Zohar <zohar@linux.ibm.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 4d3dc0de

security/integrity/digsig.c

+5 −1
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ int __init integrity_init_keyring(const unsigned int id) 
{

	struct key_restriction *restriction;

	key_perm_t perm;

	int ret;



	perm = (KEY_POS_ALL & ~KEY_POS_SETATTR) | KEY_USR_VIEW

		| KEY_USR_READ | KEY_USR_SEARCH;
@@ -141,7 +142,10 @@ int __init integrity_init_keyring(const unsigned int id) 
	perm |= KEY_USR_WRITE;



out:

	return __integrity_init_keyring(id, perm, restriction);

	ret = __integrity_init_keyring(id, perm, restriction);

	if (ret)

		kfree(restriction);

	return ret;

}



int __init integrity_add_key(const unsigned int id, const void *data,