diff options
| author | Aditya Pakki <pakki001@umn.edu> | 2019-03-18 22:19:56 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2019-03-21 07:24:38 -0400 |
| 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 <pakki001@umn.edu>
Signed-off-by: Thomas 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.edu
| -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) | |||
| 905 | return 0; | 905 | return 0; |
| 906 | 906 | ||
| 907 | hpet_set_mapping(); | 907 | hpet_set_mapping(); |
| 908 | if (!hpet_virt_address) | ||
| 909 | return 0; | ||
| 908 | 910 | ||
| 909 | /* | 911 | /* |
| 910 | * Read the period and check for a sane value: | 912 | * Read the period and check for a sane value: |
