From: Mattia Dongili <malattia@linux.it>
Cc: Andrea Gelmini <andrea.gelmini@gmail.com>,
Matthew Garrett <mjg59@srcf.ucam.org>,
anssi.hannula@iki.fi, linux-acpi@vger.kernel.org,
axel.lin@gmail.com, trenn@suse.de, len.brown@intel.com,
linux-kernel@vger.kernel.org, Dan Carpenter <error27@gmail.com>,
platform-driver-x86 <platform-driver-x86@vger.kernel.org>
Subject: sony-laptop: fix early NULL pointer dereference
Date: Tue, 5 Apr 2011 08:44:49 +0900 [thread overview]
Message-ID: <20110404234448.GA24957@kamineko.org> (raw)
In-Reply-To: <BANLkTimJa3CSWouTMJD5V0ZuMa67YXy88Q@mail.gmail.com>
Author: Mattia Dongili <malattia@linux.it>
Date: Fri Apr 1 10:01:41 2011 +0900
sony-laptop: fix early NULL pointer dereference
The SNC acpi driver could get early notifications before it fully
initializes and that could lead to dereferencing the sony_nc_handles
structure pointer that is still NULL at that stage.
Make sure we return early from the handle lookup function in these
cases.
Signed-off-by: Mattia Dongili <malattia@linux.it>
---
Hi Matthew,
if it's not too late, can you pick this one up instead of the previous
one (89ec2feafaedd759e53346d641f60863a14cfb9e)?
If it's too late I'll try and do a round of return value fixes later.
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index b2ce172..de79c18 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -810,6 +810,11 @@ static int sony_nc_handles_cleanup(struct platform_device *pd)
static int sony_find_snc_handle(int handle)
{
int i;
+
+ /* not initialized yet, return early */
+ if (!handles)
+ return -EINVAL;
+
for (i = 0; i < 0x10; i++) {
if (handles->cap[i] == handle) {
dprintk("found handle 0x%.4x (offset: 0x%.2x)\n",
--
mattia
:wq!
next prev parent reply other threads:[~2011-04-04 23:44 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-01 17:16 Regression 2.6.39-rc1 for sony-laptop Andrea Gelmini
2011-04-01 17:22 ` Matthew Garrett
2011-04-01 17:30 ` Anssi Hannula
2011-04-02 9:45 ` Andrea Gelmini
2011-04-02 9:44 ` Andrea Gelmini
2011-04-02 10:00 ` Mattia Dongili
2011-04-02 11:55 ` Dan Carpenter
2011-04-02 15:55 ` Mattia Dongili
2011-04-04 7:37 ` Dan Carpenter
2011-04-04 23:44 ` Mattia Dongili [this message]
2011-04-05 0:26 ` sony-laptop: fix early NULL pointer dereference Thiago Farina
2011-04-05 12:50 ` Dan Carpenter
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=20110404234448.GA24957@kamineko.org \
--to=malattia@linux.it \
--cc=andrea.gelmini@gmail.com \
--cc=anssi.hannula@iki.fi \
--cc=axel.lin@gmail.com \
--cc=error27@gmail.com \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mjg59@srcf.ucam.org \
--cc=platform-driver-x86@vger.kernel.org \
--cc=trenn@suse.de \
/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).