Unverified Commit 81a1ff01 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10053 vmci: prevent speculation leaks by sanitizing event in event_deliver() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yang Yingliang <yangyingliang@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/GOE2GR6PWWB7YFXB3GAT6MUYC5DDJQRD/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAD0E8 
 
Link:https://gitee.com/openeuler/kernel/pulls/10053

 

Reviewed-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 10933a12 e062b723

drivers/misc/vmw_vmci/vmci_event.c

+5 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/vmw_vmci_api.h>

#include <linux/list.h>

#include <linux/module.h>

#include <linux/nospec.h>

#include <linux/sched.h>

#include <linux/slab.h>

#include <linux/rculist.h>
@@ -86,9 +87,12 @@ static void event_deliver(struct vmci_event_msg *event_msg) 
{

	struct vmci_subscription *cur;

	struct list_head *subscriber_list;

	u32 sanitized_event, max_vmci_event;



	rcu_read_lock();

	subscriber_list = &subscriber_array[event_msg->event_data.event];

	max_vmci_event = ARRAY_SIZE(subscriber_array);

	sanitized_event = array_index_nospec(event_msg->event_data.event, max_vmci_event);

	subscriber_list = &subscriber_array[sanitized_event];

	list_for_each_entry_rcu(cur, subscriber_list, node) {

		cur->callback(cur->id, &event_msg->event_data,

			      cur->callback_data);