public inbox for linux-s390@vger.kernel.org
 help / color / mirror / Atom feed
From: Huaisheng Ye <yehs2007@zoho.com>
To: linux-nvdimm@lists.01.org, dan.j.williams@intel.com
Cc: ross.zwisler@linux.intel.com, willy@infradead.org,
	vishal.l.verma@intel.com, dave.jiang@intel.com,
	schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com,
	viro@zeniv.linux.org.uk, martin.petersen@oracle.com,
	axboe@kernel.dk, gregkh@linuxfoundation.org,
	bart.vanassche@wdc.com, jack@suse.com,
	linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org,
	linux-fsdevel@vger.kernel.org, colyli@suse.de,
	chengnt@lenovo.com, Huaisheng Ye <yehs1@lenovo.com>
Subject: [PATCH v2 2/4] nvdimm/pmem-dax: check the validity of the pointer pfn
Date: Thu,  5 Jul 2018 00:38:21 +0800	[thread overview]
Message-ID: <20180704163823.9980-3-yehs2007@zoho.com> (raw)
In-Reply-To: <20180704163823.9980-1-yehs2007@zoho.com>

From: Huaisheng Ye <yehs1@lenovo.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@intel.com>
Signed-off-by: Huaisheng Ye <yehs1@lenovo.com>
Reviewed-by: Jan Kara <jack@suse.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

  parent reply	other threads:[~2018-07-04 16:38 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-04 16:38 [PATCH v2 0/4] Assigning NULL to gfn of dax_direct_access if useless Huaisheng Ye
2018-07-04 16:38 ` [PATCH v2 1/4] nvdimm/pmem: check the validity of the pointer pfn Huaisheng Ye
2018-07-04 16:38 ` Huaisheng Ye [this message]
2018-07-04 16:38 ` [PATCH v2 3/4] s390/block/dcssblk: " Huaisheng Ye
2018-07-04 16:38 ` [PATCH v2 4/4] fs/dax: Assign NULL to gfn of dax_direct_access if useless Huaisheng Ye
2018-07-04 16:48 ` [PATCH v2 0/4] Assigning " Dan Williams
2018-07-04 16:55   ` Huaisheng Ye
2018-07-04 17:16     ` Dan Williams

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180704163823.9980-3-yehs2007@zoho.com \
    --to=yehs2007@zoho.com \
    --cc=axboe@kernel.dk \
    --cc=bart.vanassche@wdc.com \
    --cc=chengnt@lenovo.com \
    --cc=colyli@suse.de \
    --cc=dan.j.williams@intel.com \
    --cc=dave.jiang@intel.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=heiko.carstens@de.ibm.com \
    --cc=jack@suse.com \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-nvdimm@lists.01.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=martin.petersen@oracle.com \
    --cc=ross.zwisler@linux.intel.com \
    --cc=schwidefsky@de.ibm.com \
    --cc=viro@zeniv.linux.org.uk \
    --cc=vishal.l.verma@intel.com \
    --cc=willy@infradead.org \
    --cc=yehs1@lenovo.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox