Date: Wed, 24 Jul 2019 12:50:47 +0000 (UTC) From: Gordon Tetlow <gordon@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r350280 - in releng: 11.2/sys/x86/x86 11.3/sys/x86/x86 12.0/sys/x86/x86 Message-ID: <201907241250.x6OCollM071461@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gordon Date: Wed Jul 24 12:50:46 2019 New Revision: 350280 URL: https://svnweb.freebsd.org/changeset/base/350280 Log: Fix panic from Intel CPU vulnerability mitigation. Approved by: so Security: FreeBSD-EN-19:13.mds Modified: releng/11.2/sys/x86/x86/cpu_machdep.c releng/11.3/sys/x86/x86/cpu_machdep.c releng/12.0/sys/x86/x86/cpu_machdep.c Modified: releng/11.2/sys/x86/x86/cpu_machdep.c ============================================================================== --- releng/11.2/sys/x86/x86/cpu_machdep.c Wed Jul 24 12:48:51 2019 (r350279) +++ releng/11.2/sys/x86/x86/cpu_machdep.c Wed Jul 24 12:50:46 2019 (r350280) @@ -946,7 +946,6 @@ int hw_mds_disable; * architectural state except possibly %rflags. Also, it is always * called with interrupts disabled. */ -void (*mds_handler)(void); void mds_handler_void(void); void mds_handler_verw(void); void mds_handler_ivb(void); @@ -955,6 +954,7 @@ void mds_handler_skl_sse(void); void mds_handler_skl_avx(void); void mds_handler_skl_avx512(void); void mds_handler_silvermont(void); +void (*mds_handler)(void) = mds_handler_void; static int sysctl_hw_mds_disable_state_handler(SYSCTL_HANDLER_ARGS) Modified: releng/11.3/sys/x86/x86/cpu_machdep.c ============================================================================== --- releng/11.3/sys/x86/x86/cpu_machdep.c Wed Jul 24 12:48:51 2019 (r350279) +++ releng/11.3/sys/x86/x86/cpu_machdep.c Wed Jul 24 12:50:46 2019 (r350280) @@ -953,7 +953,6 @@ int hw_mds_disable; * architectural state except possibly %rflags. Also, it is always * called with interrupts disabled. */ -void (*mds_handler)(void); void mds_handler_void(void); void mds_handler_verw(void); void mds_handler_ivb(void); @@ -962,6 +961,7 @@ void mds_handler_skl_sse(void); void mds_handler_skl_avx(void); void mds_handler_skl_avx512(void); void mds_handler_silvermont(void); +void (*mds_handler)(void) = mds_handler_void; static int sysctl_hw_mds_disable_state_handler(SYSCTL_HANDLER_ARGS) Modified: releng/12.0/sys/x86/x86/cpu_machdep.c ============================================================================== --- releng/12.0/sys/x86/x86/cpu_machdep.c Wed Jul 24 12:48:51 2019 (r350279) +++ releng/12.0/sys/x86/x86/cpu_machdep.c Wed Jul 24 12:50:46 2019 (r350280) @@ -924,7 +924,6 @@ int hw_mds_disable; * architectural state except possibly %rflags. Also, it is always * called with interrupts disabled. */ -void (*mds_handler)(void); void mds_handler_void(void); void mds_handler_verw(void); void mds_handler_ivb(void); @@ -933,6 +932,7 @@ void mds_handler_skl_sse(void); void mds_handler_skl_avx(void); void mds_handler_skl_avx512(void); void mds_handler_silvermont(void); +void (*mds_handler)(void) = mds_handler_void; static int sysctl_hw_mds_disable_state_handler(SYSCTL_HANDLER_ARGS)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907241250.x6OCollM071461>