Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f451386 authored by Henrik Rydberg's avatar Henrik Rydberg Committed by Guenter Roeck
Browse files

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: default avatar <jwboyer@fedoraproject.org>
Suggested-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarHenrik Rydberg <rydberg@euromail.se>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 4b972806

drivers/hwmon/applesmc.c

+10 −1
Original line number Diff line number Diff line
@@ -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)