Commit 6cac446b authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon fix from Guenter Roeck:
 "Fix potential crash condition in applesmc driver"

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (applesmc) Check key count before proceeding
parents a7301fcc 5f451386
...@@ -525,16 +525,25 @@ static int applesmc_init_smcreg_try(void) ...@@ -525,16 +525,25 @@ static int applesmc_init_smcreg_try(void)
{ {
struct applesmc_registers *s = &smcreg; struct applesmc_registers *s = &smcreg;
bool left_light_sensor, right_light_sensor; bool left_light_sensor, right_light_sensor;
unsigned int count;
u8 tmp[1]; u8 tmp[1];
int ret; int ret;
if (s->init_complete) if (s->init_complete)
return 0; return 0;
ret = read_register_count(&s->key_count); ret = read_register_count(&count);
if (ret) if (ret)
return 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) if (!s->cache)
s->cache = kcalloc(s->key_count, sizeof(*s->cache), GFP_KERNEL); s->cache = kcalloc(s->key_count, sizeof(*s->cache), GFP_KERNEL);
if (!s->cache) if (!s->cache)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment