Commit 98c99536 authored by Aditya Pakki's avatar Aditya Pakki Committed by Stefan Bader

x86/hpet: Prevent potential NULL pointer dereference

BugLink: https://bugs.launchpad.net/bugs/1828420

[ Upstream commit 2e84f116 ]

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: default avatarAditya Pakki <pakki001@umn.edu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: kjlu@umn.edu
Cc: Borislav Petkov <bp@alien8.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Joe Perches <joe@perches.com>
Cc: Nicolai Stange <nstange@suse.de>
Cc: Roland Dreier <roland@purestorage.com>
Link: https://lkml.kernel.org/r/20190319021958.17275-1-pakki001@umn.eduSigned-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
parent 928efc24
...@@ -826,6 +826,8 @@ int __init hpet_enable(void) ...@@ -826,6 +826,8 @@ int __init hpet_enable(void)
return 0; return 0;
hpet_set_mapping(); hpet_set_mapping();
if (!hpet_virt_address)
return 0;
/* /*
* Read the period and check for a sane value: * Read the period and check for a sane value:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment