Commit e8a308e5 authored Oct 25, 2018 by Vishal Verma Committed by Borislav Petkov Nov 06, 2018

acpi/nfit, x86/mce: Validate a MCE's address before using it



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.

Fixes: 6839a6d9 ("nfit: do an ARS scrub on hitting a latent media error")
Reported-by: Robert Elliott <elliott@hpe.com>
Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
CC: Arnd Bergmann <arnd@arndb.de>
Cc: Dan Williams <dan.j.williams@intel.com>
CC: Dave Jiang <dave.jiang@intel.com>
CC: elliott@hpe.com
CC: "H. Peter Anvin" <hpa@zytor.com>
CC: Ingo Molnar <mingo@redhat.com>
CC: Len Brown <lenb@kernel.org>
CC: linux-acpi@vger.kernel.org
CC: linux-edac <linux-edac@vger.kernel.org>
CC: linux-nvdimm@lists.01.org
CC: Qiuxu Zhuo <qiuxu.zhuo@intel.com>
CC: "Rafael J. Wysocki" <rjw@rjwysocki.net>
CC: Ross Zwisler <zwisler@kernel.org>
CC: stable <stable@vger.kernel.org>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Tony Luck <tony.luck@intel.com>
CC: x86-ml <x86@kernel.org>
CC: Yazen Ghannam <yazen.ghannam@amd.com>
Link: http://lkml.kernel.org/r/20181026003729.8420-2-vishal.l.verma@intel.com

parent 5d96c934

arch/x86/include/asm/mce.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -222,6 +222,7 @@ static inline void mce_hygon_feature_init(struct cpuinfo_x86 *c) { return mce_am
		int 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

Original line number	Diff line number	Diff line
		@@ -485,7 +485,7 @@ static void mce_report_event(struct pt_regs *regs)
		* 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 mce *m)

		return 1;
		}
		EXPORT_SYMBOL_GPL(mce_usable_address);

		bool mce_is_memory_error(struct mce *m)
		{

drivers/acpi/nfit/mce.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,10 @@ static int nfit_handle_mce(struct notifier_block *nb, unsigned long val,
		if (!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

Admin message