shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

clocksource: arch_timer: make virtual counter access configurable

Browse Source 
CVE-2017-13218
Change-Id: Ibdb1fd768b748002b90bfc165612c12c8311f8a2
This commit is contained in:
Greg Hackmann
2017-09-19 10:55:17 -07:00
committed by Tao Huang
parent fe1b88d895
commit e2a963621b
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/clocksource/Kconfig
View File

@@ -161,6 +161,14 @@ config ARM_ARCH_TIMER_EVTSTREAM
This must be disabled for hardware validation purposes to detect any
hardware anomalies of missing events.
config ARM_ARCH_TIMER_VCT_ACCESS
bool "Support for ARM architected timer virtual counter access in userspace"
default !ARM64
depends on ARM_ARCH_TIMER
help
This option enables support for reading the ARM architected timer's
virtual counter in userspace.
config ARM_GLOBAL_TIMER
bool
select CLKSRC_OF if OF

5
drivers/clocksource/arm_arch_timer.c
View File

@@ -333,7 +333,10 @@ static void arch_counter_set_user_access(void)
| ARCH_TIMER_USR_PCT_ACCESS_EN);
/* Enable user access to the virtual counter */
cntkctl |= ARCH_TIMER_USR_VCT_ACCESS_EN;
if (IS_ENABLED(CONFIG_ARM_ARCH_TIMER_VCT_ACCESS))
cntkctl |= ARCH_TIMER_USR_VCT_ACCESS_EN;
else
cntkctl &= ~ARCH_TIMER_USR_VCT_ACCESS_EN;
arch_timer_set_cntkctl(cntkctl);
}