linux-kernel - [PATCH v3 2/6] s390, dcssblk: kaddr and pfn can be NULL to ->direct

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20180730071548.9172-3-yehs2007@zoho.com>
Date:   Mon, 30 Jul 2018 15:15:44 +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.cz, agk@...hat.com,
        snitzer@...hat.com, keescook@...omium.org, dm-devel@...hat.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 v3 2/6] s390, dcssblk: kaddr and pfn can be NULL to ->direct_access()

From: Huaisheng Ye <yehs1@...ovo.com>

dcssblk_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 either of them is equal 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@...ovo.com>
Reviewed-by: Ross Zwisler <ross.zwisler@...ux.intel.com>
Acked-by: Martin Schwidefsky <schwidefsky@...ibm.com>
---
 drivers/s390/block/dcssblk.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index ed60728..23e526c 100644
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -922,9 +922,11 @@ static DEVICE_ATTR(save, S_IWUSR | S_IRUSR, dcssblk_save_show,
 	unsigned long dev_sz;
 
 	dev_sz = dev_info->end - dev_info->start + 1;
-	*kaddr = (void *) dev_info->start + offset;
-	*pfn = __pfn_to_pfn_t(PFN_DOWN(dev_info->start + offset),
-			PFN_DEV|PFN_SPECIAL);
+	if (kaddr)
+		*kaddr = (void *) dev_info->start + offset;
+	if (pfn)
+		*pfn = __pfn_to_pfn_t(PFN_DOWN(dev_info->start + offset),
+				PFN_DEV|PFN_SPECIAL);
 
 	return (dev_sz - offset) / PAGE_SIZE;
 }
-- 
1.8.3.1