[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <153077337481.40830.15235657458024188710.stgit@dwillia2-desk3.amr.corp.intel.com>
Date: Wed, 04 Jul 2018 23:49:34 -0700
From: Dan Williams <dan.j.williams@...el.com>
To: akpm@...ux-foundation.org
Cc: Huaisheng Ye <yehs1@...ovo.com>, Jan Kara <jack@...e.cz>,
vishal.l.verma@...el.com, hch@....de, linux-nvdimm@...ts.01.org,
linux-mm@...ck.org, linux-kernel@...r.kernel.org
Subject: [PATCH 06/13] nvdimm/pmem: check the validity of the pointer pfn
From: Huaisheng Ye <yehs1@...ovo.com>
direct_access needs to check the validity of pointer pfn for NULL
assignment. If pfn equals to NULL, it doesn't need to calculate the value.
Signed-off-by: Huaisheng Ye <yehs1@...ovo.com>
Reviewed-by: Jan Kara <jack@...e.cz>
Signed-off-by: Dan Williams <dan.j.williams@...el.com>
---
drivers/nvdimm/pmem.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index e8ac6f244d2b..c430536320a5 100644
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -228,7 +228,8 @@ __weak long __pmem_direct_access(struct pmem_device *pmem, pgoff_t pgoff,
PFN_PHYS(nr_pages))))
return -EIO;
*kaddr = pmem->virt_addr + offset;
- *pfn = phys_to_pfn_t(pmem->phys_addr + offset, pmem->pfn_flags);
+ if (pfn)
+ *pfn = phys_to_pfn_t(pmem->phys_addr + offset, pmem->pfn_flags);
/*
* If badblocks are present, limit known good range to the
Powered by blists - more mailing lists