Skip to content

Commit b6f56a4

Browse files
Hans de Goedejmberg-intel
authored andcommitted
net: rfkill: gpio: Fix crash due to dereferencering uninitialized pointer
Since commit 7d5e973 ("net: rfkill: gpio: get the name and type from device property") rfkill_find_type() gets called with the possibly uninitialized "const char *type_name;" local variable. On x86 systems when rfkill-gpio binds to a "BCM4752" or "LNV4752" acpi_device, the rfkill->type is set based on the ACPI acpi_device_id: rfkill->type = (unsigned)id->driver_data; and there is no "type" property so device_property_read_string() will fail and leave type_name uninitialized, leading to a potential crash. rfkill_find_type() does accept a NULL pointer, fix the potential crash by initializing type_name to NULL. Note likely sofar this has not been caught because: 1. Not many x86 machines actually have a "BCM4752"/"LNV4752" acpi_device 2. The stack happened to contain NULL where type_name is stored Fixes: 7d5e973 ("net: rfkill: gpio: get the name and type from device property") Cc: [email protected] Cc: Heikki Krogerus <[email protected]> Signed-off-by: Hans de Goede <[email protected]> Reviewed-by: Heikki Krogerus <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Johannes Berg <[email protected]>
1 parent e882985 commit b6f56a4

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

net/rfkill/rfkill-gpio.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,10 @@ static const struct dmi_system_id rfkill_gpio_deny_table[] = {
9494
static int rfkill_gpio_probe(struct platform_device *pdev)
9595
{
9696
struct rfkill_gpio_data *rfkill;
97-
struct gpio_desc *gpio;
97+
const char *type_name = NULL;
9898
const char *name_property;
9999
const char *type_property;
100-
const char *type_name;
100+
struct gpio_desc *gpio;
101101
int ret;
102102

103103
if (dmi_check_system(rfkill_gpio_deny_table))

0 commit comments

Comments
 (0)