From: Aditya Pakki <pakki001@umn.edu>
To: pakki001@umn.edu
Cc: kjlu@umn.edu, Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
"H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, Kees Cook <keescook@chromium.org>,
Joe Perches <joe@perches.com>, Nicolai Stange <nstange@suse.de>,
Roland Dreier <roland@purestorage.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH] x86: hpet: Fix to avoid potential NULL pointer dereference
Date: Mon, 18 Mar 2019 21:19:56 -0500 [thread overview]
Message-ID: <20190319021958.17275-1-pakki001@umn.edu> (raw)
hpet_virt_address may be NULL when ioremap_nocache fails. The patch
checks for such a scenario and avoids NULL pointer dereference.
Signed-off-by: Aditya Pakki <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:
--
2.17.1
next reply other threads:[~2019-03-19 2:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-19 2:19 Aditya Pakki [this message]
2019-03-21 11:29 ` [tip:x86/urgent] x86/hpet: Prevent potential NULL pointer dereference tip-bot for Aditya Pakki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190319021958.17275-1-pakki001@umn.edu \
--to=pakki001@umn.edu \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=joe@perches.com \
--cc=keescook@chromium.org \
--cc=kjlu@umn.edu \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=nstange@suse.de \
--cc=roland@purestorage.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).