From: Alexander Beregalov <a.beregalov@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: Alexander Beregalov <a.beregalov@gmail.com>,
Jean Delvare <khali@linux-fr.org>,
Guenter Roeck <guenter.roeck@ericsson.com>,
stable@kernel.org
Subject: [PATCH] hwmon: (w83627ehf): fix broken driver init
Date: Sat, 5 Nov 2011 04:54:10 +0400 [thread overview]
Message-ID: <1320454450-738-1-git-send-email-a.beregalov@gmail.com> (raw)
Commit 2265cef2 (hwmon: (w83627ehf) Properly report PECI and AMD-SI
sensor types) results in kernel panic if data->temp_label was not
initialized.
The problem was found with chip W83627DHG-P.
backtrace:
page_fault()
w83627ehf_probe() 0x8e2
w83627ehf_init_device:
1837: for (i = 0; i < 3; i++) {
const char *label = data->temp_label[data->temp_src[i]];
/* Digital source overrides analog type */
if (strncmp(label, "PECI", 4) == 0)
data->temp_type[i] = 6;
movzbl 128(%r14), %edx # data->temp_src, tmp737
movq 144(%r13), %rax # data_32->temp_label, data_32->temp_label
movq $.LC18, %rsi #,
movl %r14d, %r15d #, i
subl %r13d, %r15d # D.29277, i
0x928 movq (%rax,%rdx,8), %rcx #* data_32->temp_label, label
movl $4, %edx #,
movq %rcx, %rdi # label,
movq %rcx, -96(%rbp) #,
call strncmp #
page_fault() is called at 0x928 (0x8e2+0x46).
Add check if data->temp->label was set before use.
Cc: Jean Delvare <khali@linux-fr.org>
Cc: Guenter Roeck <guenter.roeck@ericsson.com>
Cc: stable@kernel.org
Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
---
drivers/hwmon/w83627ehf.c | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index 483cb26..70f1c73 100644
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
@@ -1835,14 +1835,15 @@ static inline void __devinit w83627ehf_init_device(struct w83627ehf_data *data,
diode = 0x70;
}
for (i = 0; i < 3; i++) {
- const char *label = data->temp_label[data->temp_src[i]];
-
- /* Digital source overrides analog type */
- if (strncmp(label, "PECI", 4) == 0)
- data->temp_type[i] = 6;
- else if (strncmp(label, "AMD", 3) == 0)
- data->temp_type[i] = 5;
- else if ((tmp & (0x02 << i)))
+ if (data->temp_label) {
+ const char *label = data->temp_label[data->temp_src[i]];
+
+ /* Digital source overrides analog type */
+ if (strncmp(label, "PECI", 4) == 0)
+ data->temp_type[i] = 6;
+ else if (strncmp(label, "AMD", 3) == 0)
+ data->temp_type[i] = 5;
+ } else if ((tmp & (0x02 << i)))
data->temp_type[i] = (diode & (0x10 << i)) ? 1 : 3;
else
data->temp_type[i] = 4; /* thermistor */
--
1.7.7.2
next reply other threads:[~2011-11-05 0:54 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-05 0:54 Alexander Beregalov [this message]
2011-11-05 1:12 ` Guenter Roeck
2011-11-05 4:51 ` Guenter Roeck
2011-11-05 8:13 ` Jean Delvare
2011-11-05 14:38 ` Guenter Roeck
2011-11-05 12:08 ` Alexander Beregalov
2011-11-05 14:43 [PATCH] hwmon: (w83627ehf) " Guenter Roeck
2011-11-06 12:02 ` Jean Delvare
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=1320454450-738-1-git-send-email-a.beregalov@gmail.com \
--to=a.beregalov@gmail.com \
--cc=guenter.roeck@ericsson.com \
--cc=khali@linux-fr.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@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
all inboxes | Powered by JetHome®