Unverified Commit 31ea5bb4 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12688 security/keys: fix slab-out-of-bounds in key_task_permission 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yi Yang <yiyang13@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/XFRS7UTZX3FFGO3DY2KSCVUUOKLBEGZD/ 
 
https://gitee.com/openeuler/kernel/issues/IAU173 
 
Link:https://gitee.com/openeuler/kernel/pulls/12688

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents fad05042 c17606f2

security/keys/keyring.c

+5 −2
Original line number Diff line number Diff line
@@ -772,8 +772,11 @@ static bool search_nested_keyrings(struct key *keyring, 
	for (; slot < ASSOC_ARRAY_FAN_OUT; slot++) {

		ptr = READ_ONCE(node->slots[slot]);



		if (assoc_array_ptr_is_meta(ptr) && node->back_pointer)

		if (assoc_array_ptr_is_meta(ptr)) {

			if (node->back_pointer ||

			    assoc_array_ptr_is_shortcut(ptr))

				goto descend_to_node;

		}



		if (!keyring_ptr_is_keyring(ptr))

			continue;