diff options
| author | Huaisheng Ye <yehs1@lenovo.com> | 2018-07-30 15:15:43 +0800 |
|---|---|---|
| committer | Dave Jiang <dave.jiang@intel.com> | 2018-07-30 09:32:38 -0700 |
| commit | 46a590cde0bd17cc983e40e74c195311cc8ba555 (patch) | |
| tree | 081999398bb013bfa5505a76b4ce4a2e510de7c1 /drivers/nvdimm | |
| parent | cc3d3458d46f702b1d118fca8647dc9157887d9b (diff) | |
| download | linux-stable-46a590cde0bd17cc983e40e74c195311cc8ba555.tar.gz linux-stable-46a590cde0bd17cc983e40e74c195311cc8ba555.tar.bz2 linux-stable-46a590cde0bd17cc983e40e74c195311cc8ba555.zip | |
libnvdimm, pmem: kaddr and pfn can be NULL to ->direct_access()
pmem_direct_access() needs to check the validity of pointers kaddr
and pfn for NULL assignment. If anyone equals to NULL, it doesn't need
to calculate the value.
If pointer equals to NULL, that is to say callers may have no need for
kaddr or pfn, so this patch is prepared for allowing them to pass in
NULL instead of having to pass in a pointer or local variable that
they then just throw away.
Signed-off-by: Huaisheng Ye <yehs1@lenovo.com>
Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Diffstat (limited to 'drivers/nvdimm')
| -rw-r--r-- | drivers/nvdimm/pmem.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c index 68940356cad3..f3096564acb2 100644 --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -227,8 +227,11 @@ __weak long __pmem_direct_access(struct pmem_device *pmem, pgoff_t pgoff, if (unlikely(is_bad_pmem(&pmem->bb, PFN_PHYS(pgoff) / 512, PFN_PHYS(nr_pages)))) return -EIO; - *kaddr = pmem->virt_addr + offset; - *pfn = phys_to_pfn_t(pmem->phys_addr + offset, pmem->pfn_flags); + + if (kaddr) + *kaddr = pmem->virt_addr + offset; + if (pfn) + *pfn = phys_to_pfn_t(pmem->phys_addr + offset, pmem->pfn_flags); /* * If badblocks are present, limit known good range to the |