aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHenrik Rydberg <rydberg@euromail.se>2013-09-26 08:33:16 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-10-05 07:00:40 -0700
commit94c7268325e30ecb4767b9c080e8cec9c92d6689 (patch)
tree40b635b264c80b12aa1615bb8e882d0d61874e7a /drivers
parentd0d0e6c36f6d9fdf0df50c4d1877156b7bcff565 (diff)
downloadkernel_samsung_smdk4412-94c7268325e30ecb4767b9c080e8cec9c92d6689.zip
kernel_samsung_smdk4412-94c7268325e30ecb4767b9c080e8cec9c92d6689.tar.gz
kernel_samsung_smdk4412-94c7268325e30ecb4767b9c080e8cec9c92d6689.tar.bz2
hwmon: (applesmc) Check key count before proceeding
commit 5f4513864304672e6ea9eac60583eeac32e679f2 upstream. After reports from Chris and Josh Boyer of a rare crash in applesmc, Guenter pointed at the initialization problem fixed below. The patch has not been verified to fix the crash, but should be applied regardless. Reported-by: <jwboyer@fedoraproject.org> Suggested-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hwmon/applesmc.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
index d99aa84..6218d08 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -485,16 +485,25 @@ static int applesmc_init_smcreg_try(void)
{
struct applesmc_registers *s = &smcreg;
bool left_light_sensor, right_light_sensor;
+ unsigned int count;
u8 tmp[1];
int ret;
if (s->init_complete)
return 0;
- ret = read_register_count(&s->key_count);
+ ret = read_register_count(&count);
if (ret)
return ret;
+ if (s->cache && s->key_count != count) {
+ pr_warn("key count changed from %d to %d\n",
+ s->key_count, count);
+ kfree(s->cache);
+ s->cache = NULL;
+ }
+ s->key_count = count;
+
if (!s->cache)
s->cache = kcalloc(s->key_count, sizeof(*s->cache), GFP_KERNEL);
if (!s->cache)