From: Huaisheng Ye <yehs2007@zoho.com>
To: linux-nvdimm@lists.01.org, dan.j.williams@intel.com
Cc: axboe@kernel.dk, linux-s390@vger.kernel.org, chengnt@lenovo.com,
linux-fsdevel@vger.kernel.org, heiko.carstens@de.ibm.com,
linux-kernel@vger.kernel.org, willy@infradead.org,
bart.vanassche@wdc.com, viro@zeniv.linux.org.uk,
gregkh@linuxfoundation.org, schwidefsky@de.ibm.com, jack@suse.cz
Subject: [PATCH 1/5] libnvdimm, pmem: Allow a NULL-kaddr to ->direct_access()
Date: Tue, 24 Jul 2018 16:45:06 +0800 [thread overview]
Message-ID: <20180724084510.6104-2-yehs2007@zoho.com> (raw)
In-Reply-To: <20180724084510.6104-1-yehs2007@zoho.com>
From: Huaisheng Ye <yehs1@lenovo.com>
pmem_direct_access() needs to check the validity of second rank
pointer kaddr for NULL assignment. If kaddr equals to NULL, it
doesn't need to calculate the value.
Signed-off-by: Huaisheng Ye <yehs1@lenovo.com>
---
drivers/nvdimm/pmem.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index 9d71492..b1d121a 100644
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -232,7 +232,9 @@ __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;
+
+ if (kaddr)
+ *kaddr = pmem->virt_addr + offset;
*pfn = phys_to_pfn_t(pmem->phys_addr + offset, pmem->pfn_flags);
/*
--
1.8.3.1
_______________________________________________
Linux-nvdimm mailing list
Linux-nvdimm@lists.01.org
https://lists.01.org/mailman/listinfo/linux-nvdimm
next prev parent reply other threads:[~2018-07-24 8:45 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-24 8:45 [PATCH 0/5] Do not request a pointer kaddr when not required Huaisheng Ye
2018-07-24 8:45 ` Huaisheng Ye [this message]
2018-07-24 8:45 ` [PATCH 2/5] tools/testing/nvdimm: Allow a NULL-kaddr to ->direct_access() Huaisheng Ye
2018-07-24 8:45 ` [PATCH 3/5] s390, dcssblk: " Huaisheng Ye
2018-07-24 8:53 ` Christian Borntraeger
2018-07-24 9:46 ` [External] " Huaisheng HS1 Ye
2018-07-24 11:16 ` Christian Borntraeger
2018-07-24 14:28 ` Huaisheng HS1 Ye
2018-07-24 8:45 ` [PATCH 4/5] filesystem-dax: Do not request a pointer kaddr when not required Huaisheng Ye
2018-07-24 8:45 ` [PATCH 5/5] dax/super: " Huaisheng Ye
2018-07-24 14:50 ` [PATCH 0/5] " Ross Zwisler
2018-07-24 15:41 ` [External] " Huaisheng HS1 Ye
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=20180724084510.6104-2-yehs2007@zoho.com \
--to=yehs2007@zoho.com \
--cc=axboe@kernel.dk \
--cc=bart.vanassche@wdc.com \
--cc=chengnt@lenovo.com \
--cc=dan.j.williams@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=heiko.carstens@de.ibm.com \
--cc=jack@suse.cz \
--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=schwidefsky@de.ibm.com \
--cc=viro@zeniv.linux.org.uk \
--cc=willy@infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).