diff options
| author | Aditya Pakki <[email protected]> | 2019-03-18 21:19:56 -0500 |
|---|---|---|
| committer | Thomas Gleixner <[email protected]> | 2019-03-21 12:24:38 +0100 |
| commit | 2e84f116afca3719c9d0a1a78b47b48f75fd5724 (patch) | |
| tree | bc904b4ec34bfd80cd758b509f2e28958c9b2016 | |
| parent | 725e29db8cb9058976559bc3239c97ef7db40eea (diff) | |
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 <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Cc: [email protected]
Cc: Borislav Petkov <[email protected]>
Cc: "H. Peter Anvin" <[email protected]>
Cc: Kees Cook <[email protected]>
Cc: Joe Perches <[email protected]>
Cc: Nicolai Stange <[email protected]>
Cc: Roland Dreier <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]
| -rw-r--r-- | arch/x86/kernel/hpet.c | 2 |
1 files changed, 2 insertions, 0 deletions
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: |