1 files changed, 11 insertions, 4 deletions

diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c
index 0431883653be..559c1173de1c 100644
--- a/drivers/acpi/apei/einj.c
+++ b/drivers/acpi/apei/einj.c
@@ -519,7 +519,7 @@ static int einj_error_inject(u32 type, u32 flags, u64 param1, u64 param2,
                              u64 param3, u64 param4)
 {
         int rc;
-        unsigned long pfn;
+        u64 base_addr, size;
 
         /* If user manually set "flags", make sure it is legal */
         if (flags && (flags &
@@ -545,10 +545,17 @@ static int einj_error_inject(u32 type, u32 flags, u64 param1, u64 param2,
         /*
          * Disallow crazy address masks that give BIOS leeway to pick
          * injection address almost anywhere. Insist on page or
-         * better granularity and that target address is normal RAM.
+         * better granularity and that target address is normal RAM or
+         * NVDIMM.
          */
-        pfn = PFN_DOWN(param1 & param2);
-        if (!page_is_ram(pfn) || ((param2 & PAGE_MASK) != PAGE_MASK))
+        base_addr = param1 & param2;
+        size = ~param2 + 1;
+
+        if (((param2 & PAGE_MASK) != PAGE_MASK) ||
+            ((region_intersects(base_addr, size, IORESOURCE_SYSTEM_RAM, IORES_DESC_NONE)
+                                != REGION_INTERSECTS) &&
+             (region_intersects(base_addr, size, IORESOURCE_MEM, IORES_DESC_PERSISTENT_MEMORY)
+                                != REGION_INTERSECTS)))
                 return -EINVAL;
 
 inject: