summaryrefslogtreecommitdiff
path: root/drivers/acpi/nfit/mce.c
diff options
context:
space:
mode:
authorMiquel Raynal <miquel.raynal@bootlin.com>2018-11-13 09:31:46 +0100
committerMiquel Raynal <miquel.raynal@bootlin.com>2018-11-13 09:31:46 +0100
commit9e3e4d8a093b81a6e5bf453b073a0a531411ab6e (patch)
tree4f4b54f5192dabddeb2864035115336f5cdade51 /drivers/acpi/nfit/mce.c
parent647ad49ca672b80a3fbf8396bd453ef68ba4916c (diff)
parentccda4af0f4b92f7b4c308d3acc262f4a7e3affad (diff)
Merge tag 'v4.20-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into nand/next
Linux 4.20-rc2
Diffstat (limited to 'drivers/acpi/nfit/mce.c')
-rw-r--r--drivers/acpi/nfit/mce.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/acpi/nfit/mce.c b/drivers/acpi/nfit/mce.c
index e9626bf6ca29..d6c1b10f6c25 100644
--- a/drivers/acpi/nfit/mce.c
+++ b/drivers/acpi/nfit/mce.c
@@ -25,8 +25,12 @@ static int nfit_handle_mce(struct notifier_block *nb, unsigned long val,
struct acpi_nfit_desc *acpi_desc;
struct nfit_spa *nfit_spa;
- /* We only care about memory errors */
- if (!mce_is_memory_error(mce))
+ /* We only care about uncorrectable memory errors */
+ 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;
/*