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

!5820 [sync] PR-5789: perf/x86/lbr: Filter vsyscall addresses 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/5789 
 
PR sync from: Luo Gengkun <luogengkun2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/PJKT4QQ4F2IEREVGJUB6SILVPAIAC5IV/ 
 
https://gitee.com/src-openeuler/kernel/issues/I94P3R 
 
Link:https://gitee.com/openeuler/kernel/pulls/5820

 

Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 95f52358 325885a8

arch/x86/events/intel/lbr.c

+3 −2
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <asm/perf_event.h>

#include <asm/msr.h>

#include <asm/insn.h>

#include <linux/mm.h>



#include "../perf_event.h"
@@ -1223,9 +1224,9 @@ static int branch_type(unsigned long from, unsigned long to, int abort) 
		 * The LBR logs any address in the IP, even if the IP just

		 * faulted. This means userspace can control the from address.

		 * Ensure we don't blindy read any address by validating it is

		 * a known text address.

		 * a known text address and not a vsyscall address.

		 */

		if (kernel_text_address(from)) {

		if (kernel_text_address(from) && !in_gate_area_no_mm(from)) {

			addr = (void *)from;

			/*

			 * Assume we can get the maximum possible size