lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

integrity: Fix memory leakage in keyring allocation error path

Browse Source 
[ Upstream commit 39419ef7af0916cc3620ecf1ed42d29659109bf3 ]

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

Fixes: 2b6aa412ff ("KEYS: Use structure to capture key restriction function and data")
Signed-off-by: GUO Zihua <guozihua@huawei.com>
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
GUO Zihua 2022-11-11 18:13:17 +08:00 committed by Greg Kroah-Hartman
parent 4d3dc0de9c
commit 9b7c44885a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
security/integrity/digsig.c
View File

@ -121,6 +121,7 @@ int __init integrity_init_keyring(const unsigned int id)
{ {
struct key_restriction *restriction; struct key_restriction *restriction;
key_perm_t perm; key_perm_t perm;
int ret;
perm = (KEY_POS_ALL & ~KEY_POS_SETATTR) | KEY_USR_VIEW perm = (KEY_POS_ALL & ~KEY_POS_SETATTR) | KEY_USR_VIEW
| KEY_USR_READ | KEY_USR_SEARCH; | KEY_USR_READ | KEY_USR_SEARCH;
@ -141,7 +142,10 @@ int __init integrity_init_keyring(const unsigned int id)
perm |= KEY_USR_WRITE; perm |= KEY_USR_WRITE;
out: 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, int __init integrity_add_key(const unsigned int id, const void *data,