linux-kernel - [tip:x86/urgent] x86/hpet: Prevent potential NULL pointer dereference

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] [day] [month] [year] [list]

Date:   Thu, 21 Mar 2019 04:29:34 -0700
From:   tip-bot for Aditya Pakki <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     hpa@...or.com, keescook@...omium.org, pakki001@....edu,
        mingo@...nel.org, bp@...en8.de, tglx@...utronix.de,
        linux-kernel@...r.kernel.org, roland@...estorage.com,
        nstange@...e.de, joe@...ches.com
Subject: [tip:x86/urgent] x86/hpet: Prevent potential NULL pointer
 dereference

Commit-ID:  2e84f116afca3719c9d0a1a78b47b48f75fd5724
Gitweb:     https://git.kernel.org/tip/2e84f116afca3719c9d0a1a78b47b48f75fd5724
Author:     Aditya Pakki <pakki001@....edu>
AuthorDate: Mon, 18 Mar 2019 21:19:56 -0500
Committer:  Thomas Gleixner <tglx@...utronix.de>
CommitDate: Thu, 21 Mar 2019 12:24:38 +0100

x86/hpet: Prevent potential NULL pointer dereference

hpet_virt_address may be NULL when ioremap_nocache fail, but the code lacks
a check.

Add a check to prevent NULL pointer dereference.

Signed-off-by: Aditya Pakki <pakki001@....edu>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Cc: kjlu@....edu
Cc: Borislav Petkov <bp@...en8.de>
Cc: "H. Peter Anvin" <hpa@...or.com>
Cc: Kees Cook <keescook@...omium.org>
Cc: Joe Perches <joe@...ches.com>
Cc: Nicolai Stange <nstange@...e.de>
Cc: Roland Dreier <roland@...estorage.com>
Link: https://lkml.kernel.org/r/20190319021958.17275-1-pakki001@umn.edu

---
 arch/x86/kernel/hpet.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index dfd3aca82c61..fb32925a2e62 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -905,6 +905,8 @@ int __init hpet_enable(void)
 		return 0;

 	hpet_set_mapping();
+	if (!hpet_virt_address)
+		return 0;

 	/*
 	 * Read the period and check for a sane value: