linux-kernel - [PATCH 2/3] drivers/s390/block/dcssblk: check the validity of the pointer pfn

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: <20180704064058.1344-2-yehs2007@zoho.com>
Date:   Wed,  4 Jul 2018 14:40:57 +0800
From:   Huaisheng Ye <yehs2007@...o.com>
To:     linux-nvdimm@...ts.01.org
Cc:     dan.j.williams@...el.com, ross.zwisler@...ux.intel.com,
        mawilcox@...rosoft.com, 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,
        chengnt@...ovo.com, linux-kernel@...r.kernel.org,
        linux-s390@...r.kernel.org, linux-fsdevel@...r.kernel.org,
        Huaisheng Ye <yehs1@...ovo.com>
Subject: [PATCH 2/3] drivers/s390/block/dcssblk: check the validity of the pointer pfn

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

Some functions within fs/dax don't need to get gfn from direct_access.
Assigning NULL to gfn of dax_direct_access is more intuitive and simple
than offering a useless local variable.

So direct_access needs to check validity of the pointer pfn For NULL
assignment. If pfn equals to NULL, it doesn't need to calculate its
value.

Signed-off-by: Huaisheng Ye <yehs1@...ovo.com>
---
 drivers/s390/block/dcssblk.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index 0a312e4..5cdfa02 100644
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -916,7 +916,8 @@ static DEVICE_ATTR(save, S_IWUSR | S_IRUSR, dcssblk_save_show,
 
 	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),
+	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