1 files changed, 9 insertions, 1 deletions

diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index 042baec56931..608fc4464574 100644
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -164,14 +164,22 @@ static int pmem_rw_page(struct block_device *bdev, sector_t sector,
 }
 
 static long pmem_direct_access(struct block_device *bdev, sector_t sector,
-                      void __pmem **kaddr, pfn_t *pfn)
+                      void __pmem **kaddr, pfn_t *pfn, long size)
 {
         struct pmem_device *pmem = bdev->bd_queue->queuedata;
         resource_size_t offset = sector * 512 + pmem->data_offset;
 
+        if (unlikely(is_bad_pmem(&pmem->bb, sector, size)))
+                return -EIO;
         *kaddr = pmem->virt_addr + offset;
         *pfn = phys_to_pfn_t(pmem->phys_addr + offset, pmem->pfn_flags);
 
+        /*
+         * If badblocks are present, limit known good range to the
+         * requested range.
+         */
+        if (unlikely(pmem->bb.count))
+                return size;
         return pmem->size - pmem->pfn_pad - offset;
 }