[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20180704163823.9980-3-yehs2007@zoho.com>
Date: Thu, 5 Jul 2018 00:38:21 +0800
From: Huaisheng Ye <yehs2007@...o.com>
To: linux-nvdimm@...ts.01.org, dan.j.williams@...el.com
Cc: ross.zwisler@...ux.intel.com, willy@...radead.org,
vishal.l.verma@...el.com, dave.jiang@...el.com,
schwidefsky@...ibm.com, heiko.carstens@...ibm.com,
viro@...iv.linux.org.uk, martin.petersen@...cle.com,
axboe@...nel.dk, gregkh@...uxfoundation.org,
bart.vanassche@....com, jack@...e.com,
linux-kernel@...r.kernel.org, linux-s390@...r.kernel.org,
linux-fsdevel@...r.kernel.org, colyli@...e.de, chengnt@...ovo.com,
Huaisheng Ye <yehs1@...ovo.com>
Subject: [PATCH v2 2/4] nvdimm/pmem-dax: 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.
Suggested-by: Dan Williams <dan.j.williams@...el.com>
Signed-off-by: Huaisheng Ye <yehs1@...ovo.com>
Reviewed-by: Jan Kara <jack@...e.cz>
---
tools/testing/nvdimm/pmem-dax.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tools/testing/nvdimm/pmem-dax.c b/tools/testing/nvdimm/pmem-dax.c
index b53596a..d4cb528 100644
--- a/tools/testing/nvdimm/pmem-dax.c
+++ b/tools/testing/nvdimm/pmem-dax.c
@@ -33,7 +33,8 @@ long __pmem_direct_access(struct pmem_device *pmem, pgoff_t pgoff,
*kaddr = pmem->virt_addr + offset;
page = vmalloc_to_page(pmem->virt_addr + offset);
- *pfn = page_to_pfn_t(page);
+ if (pfn)
+ *pfn = page_to_pfn_t(page);
pr_debug_ratelimited("%s: pmem: %p pgoff: %#lx pfn: %#lx\n",
__func__, pmem, pgoff, page_to_pfn(page));
@@ -41,7 +42,8 @@ long __pmem_direct_access(struct pmem_device *pmem, pgoff_t pgoff,
}
*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
--
1.8.3.1
Powered by blists - more mailing lists