mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-05 14:50:13 +00:00
hwmon: (applesmc) Check key count before proceeding
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> Cc: stable@vger.kernel.org Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
parent
4b97280675
commit
5f45138643
@ -525,16 +525,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)
|
||||
|
Loading…
Reference in New Issue
Block a user