Patch "acpi/nfit, x86/mce: Validate a MCE's address before using it" has been added to the 4.19-stable tree
Subsystems (3)
[email protected]
AppliedThis is a note to let you know that I've just added the patch titled
acpi/nfit, x86/mce: Validate a MCE's address before using it
to the 4.19-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
acpi-nfit-x86-mce-validate-a-mce-s-address-before-using-it.patch
and it can be found in the queue-4.19 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
e8a308e5f47e545e0d41d0686c00f5f5217c5f61Mon Sep 17 00:00:00 2001
From: Vishal Verma <[email protected]>
Date: Thu, 25 Oct 2018 18:37:29 -0600
Subject: acpi/nfit, x86/mce: Validate a MCE's address before using it
From: Vishal Verma <[email protected]>
commit e8a308e5f47e545e0d41d0686c00f5f5217c5f61 upstream.
The NFIT machine check handler uses the physical address from the mce structure, and compares it against information in the ACPI NFIT table to determine whether that location lies on an NVDIMM. The mce->addr field however may not always be valid, and this is indicated by the MCI_STATUS_ADDRV bit in the status field.
Export mce_usable_address() which already performs validation for the address, and use it in the NFIT handler.
--- arch/x86/include/asm/mce.h | 1 + arch/x86/kernel/cpu/mcheck/mce.c | 3 ++- drivers/acpi/nfit/mce.c | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-)
arch/x86/include/asm/mce.h +1 -0
@@ -217,6 +217,7 @@ static inline int umc_normaddr_to_sysaddint mce_available (struct cpuinfo_x86 *c);bool mce_is_memory_error (struct mce *m);bool mce_is_correctable (struct mce *m); +int mce_usable_address (struct mce *m);DECLARE_PER_CPU (unsigned, mce_exception_count);DECLARE_PER_CPU (unsigned, mce_poll_count);
arch/x86/kernel/cpu/mcheck/mce.c +2 -1
@@ -485,7 +485,7 @@ static void mce_report_event(struct pt_r* be somewhat complicated (e.g. segment offset would require an instruction * parser). So only support physical addresses up to page granuality for now. */ -static int mce_usable_address (struct mce *m) +int mce_usable_address (struct mce *m) {if (!(m->status &MCI_STATUS_ADDRV ))return 0 ;
@@ -505,6 +505,7 @@ static int mce_usable_address(struct mcereturn 1 ; } +EXPORT_SYMBOL_GPL (mce_usable_address);bool mce_is_memory_error (struct mce *m) {
drivers/acpi/nfit/mce.c +4 -0
@@ -29,6 +29,10 @@ static int nfit_handle_mce(struct notifiif (!mce_is_memory_error (mce) ||mce_is_correctable (mce))return NOTIFY_DONE ; +/* Verify the address reported in the MCE is valid. */ +if (!mce_usable_address (mce)) +return NOTIFY_DONE ; +/* * mce->addr contains the physical addr accessed that caused the * machine check. We need to walk through the list of NFITs, and see
Patches currently in stable-queue which might be from [email protected] are
queue-4.19/acpi-nfit-x86-mce-validate-a-mce-s-address-before-using-it.patch queue-4.19/acpi-nfit-x86-mce-handle-only-uncorrectable-machine-checks.patch
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm