Commit a6014693 authored Jul 26, 2013 by Simon Horman

ARM: shmobile: lager: do not annotate gpio_buttons as __initdata



When the gpio-keys device is registered using
platform_device_register_data() the platform data argument,
lager_keys_pdata is duplicated and thus should be marked as __initdata
to avoid wasting memory. However, this is not true of gpio_buttons,
a reference to it rather than its value is duplicated when lager_keys_pdata
is duplicated.

This avoids accessing freed memory if gpio-key events occur
after unused kernel memory is freed late in the kernel's boot.

This but was added when support for gpio-keys was added to lager
in c3842e4f
("ARM: shmobile: lager: support GPIO switches") which was included
in v3.11-rc1.

Tested-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

parent fa3e0cee

arch/arm/mach-shmobile/board-lager.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@ static __initdata struct gpio_led_platform_data lager_leds_pdata = {
		#define GPIO_KEY(c, g, d, ...) \
		{ .code = c, .gpio = g, .desc = d, .active_low = 1 }

		static __initdata struct gpio_keys_button gpio_buttons[] = {
		static struct gpio_keys_button gpio_buttons[] = {
		GPIO_KEY(KEY_4, RCAR_GP_PIN(1, 28), "SW2-pin4"),
		GPIO_KEY(KEY_3, RCAR_GP_PIN(1, 26), "SW2-pin3"),
		GPIO_KEY(KEY_2, RCAR_GP_PIN(1, 24), "SW2-pin2"),