From: Dan Carpenter <dan.carpenter@oracle.com>
To: "Pali Rohár" <pali.rohar@gmail.com>,
"Darren Hart" <dvhart@infradead.org>
Cc: Gabriele Mazzotta <gabriele.mzt@gmail.com>,
Matthew Garrett <mjg59@srcf.ucam.org>,
kbuild@01.org, platform-driver-x86@vger.kernel.org
Subject: [patch] dell-laptop: fix kbd_timeout handling
Date: Wed, 3 Dec 2014 13:01:59 +0300 [thread overview]
Message-ID: <20141203100159.GA18731@mwanda> (raw)
In-Reply-To: <1417597233.14672.2.camel@Pali-Nokia-N900>
The original code had a static checker warning:
drivers/platform/x86/dell-laptop.c:1389 kbd_led_timeout_store()
warn: this array is probably non-NULL. 'quirks->kbd_timeouts'
This warning does indicate a bug. I have added a .needs_kbd_timeouts
flag which is true if the .kbd_timeouts[] array has been declared.
Otherwise, in the original code the quirk_dell_vostro_v130 struct didn't
have .kbd_timeouts[] declared so the loop:
for (i = 0; quirks->kbd_timeouts[i] != -1; i++) {
Would have read beyond the end of the struct with unpredictable results.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
This fixes a patch in Darren Hart's tree and it may not have yet reached
linux-next. The patch is 167e24aa8adf ('platform: x86: dell-laptop: Add
support for keyboard backlight')
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
index 46e9037..a311375 100644
--- a/drivers/platform/x86/dell-laptop.c
+++ b/drivers/platform/x86/dell-laptop.c
@@ -72,6 +72,7 @@ struct calling_interface_structure {
struct quirk_entry {
u8 touchpad_led;
+ int needs_kbd_timeouts;
/* Ordered list of timeouts expressed in seconds.
* The list must end with -1 */
int kbd_timeouts[];
@@ -90,6 +91,7 @@ static int __init dmi_matched(const struct dmi_system_id *dmi)
}
static struct quirk_entry quirk_dell_xps13_9333 = {
+ .needs_kbd_timeouts = 1,
.kbd_timeouts = { 0, 5, 15, 60, 5*60, 15*60, -1 },
};
@@ -1386,7 +1388,7 @@ static ssize_t kbd_led_timeout_store(struct device *dev,
return -EINVAL;
}
- if (quirks && quirks->kbd_timeouts)
+ if (quirks && quirks->needs_kbd_timeouts)
convert = true;
if (convert) {
@@ -1401,7 +1403,7 @@ static ssize_t kbd_led_timeout_store(struct device *dev,
unit = KBD_TIMEOUT_SECONDS;
}
- if (quirks && quirks->kbd_timeouts) {
+ if (quirks && quirks->needs_kbd_timeouts) {
for (i = 0; quirks->kbd_timeouts[i] != -1; i++) {
if (value <= quirks->kbd_timeouts[i]) {
value = quirks->kbd_timeouts[i];
next parent reply other threads:[~2014-12-03 10:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1417597233.14672.2.camel@Pali-Nokia-N900>
2014-12-03 10:01 ` Dan Carpenter [this message]
2014-12-03 7:33 ` [patch] dell-laptop: fix kbd_timeout handling Darren Hart
2014-12-04 8:30 ` Dan Carpenter
2014-12-04 9:42 ` Pali Rohár
2014-12-04 10:58 ` Gabriele Mazzotta
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=20141203100159.GA18731@mwanda \
--to=dan.carpenter@oracle.com \
--cc=dvhart@infradead.org \
--cc=gabriele.mzt@gmail.com \
--cc=kbuild@01.org \
--cc=mjg59@srcf.ucam.org \
--cc=pali.rohar@gmail.com \
--cc=platform-driver-x86@vger.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