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

!2641 Fix CVE-2023-5717 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yang Jihong <yangjihong1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/WDBTH5HW2ND3V7D56OC6URR27UBVGOQD/ 
Peter Zijlstra (1):
  perf: Disallow mis-matched inherited group reads

Yang Jihong (1):
  perf: Fix kabi breakage in struct perf_event


-- 
2.34.1
 
https://gitee.com/src-openeuler/kernel/issues/I8B1X3 
 
Link:https://gitee.com/openeuler/kernel/pulls/2641

 

Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 941952a3 d6897d07

include/linux/perf_event.h

+2 −0
Original line number Diff line number Diff line
@@ -787,6 +787,8 @@ struct perf_event { 
	void *security;

#endif

	struct list_head		sb_list;



	KABI_EXTEND(unsigned int group_generation)

#endif /* CONFIG_PERF_EVENTS */

};

kernel/events/core.c

+34 −6
Original line number Diff line number Diff line
@@ -1967,6 +1967,7 @@ static void perf_group_attach(struct perf_event *event) 


	list_add_tail(&event->sibling_list, &group_leader->sibling_list);

	group_leader->nr_siblings++;

	group_leader->group_generation++;



	perf_event__header_size(group_leader);
@@ -2159,6 +2160,7 @@ static void perf_group_detach(struct perf_event *event) 
	if (leader != event) {

		list_del_init(&event->sibling_list);

		event->group_leader->nr_siblings--;

		event->group_leader->group_generation++;

		goto out;

	}
@@ -5144,7 +5146,7 @@ static int __perf_read_group_add(struct perf_event *leader, 
					u64 read_format, u64 *values)

{

	struct perf_event_context *ctx = leader->ctx;

	struct perf_event *sub;

	struct perf_event *sub, *parent;

	unsigned long flags;

	int n = 1; /* skip @nr */

	int ret;
@@ -5154,6 +5156,33 @@ static int __perf_read_group_add(struct perf_event *leader, 
		return ret;



	raw_spin_lock_irqsave(&ctx->lock, flags);

	/*

	 * Verify the grouping between the parent and child (inherited)

	 * events is still in tact.

	 *

	 * Specifically:

	 *  - leader->ctx->lock pins leader->sibling_list

	 *  - parent->child_mutex pins parent->child_list

	 *  - parent->ctx->mutex pins parent->sibling_list

	 *

	 * Because parent->ctx != leader->ctx (and child_list nests inside

	 * ctx->mutex), group destruction is not atomic between children, also

	 * see perf_event_release_kernel(). Additionally, parent can grow the

	 * group.

	 *

	 * Therefore it is possible to have parent and child groups in a

	 * different configuration and summing over such a beast makes no sense

	 * what so ever.

	 *

	 * Reject this.

	 */

	parent = leader->parent;

	if (parent &&

	    (parent->group_generation != leader->group_generation ||

	     parent->nr_siblings != leader->nr_siblings)) {

		ret = -ECHILD;

		goto unlock;

	}



	/*

	 * Since we co-schedule groups, {enabled,running} times of siblings
@@ -5183,8 +5212,9 @@ static int __perf_read_group_add(struct perf_event *leader, 
			values[n++] = primary_event_id(sub);

	}



unlock:

	raw_spin_unlock_irqrestore(&ctx->lock, flags);

	return 0;

	return ret;

}



static int perf_read_group(struct perf_event *event,
@@ -5203,10 +5233,6 @@ static int perf_read_group(struct perf_event *event, 


	values[0] = 1 + leader->nr_siblings;



	/*

	 * By locking the child_mutex of the leader we effectively

	 * lock the child list of all siblings.. XXX explain how.

	 */

	mutex_lock(&leader->child_mutex);



	ret = __perf_read_group_add(leader, read_format, values);
@@ -12778,6 +12804,8 @@ static int inherit_group(struct perf_event *parent_event, 
		    !perf_get_aux_event(child_ctr, leader))

			return -EINVAL;

	}

	if (leader)

		leader->group_generation = parent_event->group_generation;

	return 0;

}