Skip to content

Commit 47ade5f

Browse files
Hans de Goedegregkh
authored andcommitted
net: rfkill: gpio: Fix crash due to dereferencering uninitialized pointer
[ Upstream commit b6f56a4 ] 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: stable@vger.kernel.org Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com> Signed-off-by: Hans de Goede <hansg@kernel.org> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Link: https://patch.msgid.link/20250913113515.21698-1-hansg@kernel.org Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 9ccec4f commit 47ade5f

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
@@ -78,10 +78,10 @@ static int rfkill_gpio_acpi_probe(struct device *dev,
7878
static int rfkill_gpio_probe(struct platform_device *pdev)
7979
{
8080
struct rfkill_gpio_data *rfkill;
81-
struct gpio_desc *gpio;
81+
const char *type_name = NULL;
8282
const char *name_property;
8383
const char *type_property;
84-
const char *type_name;
84+
struct gpio_desc *gpio;
8585
int ret;
8686

8787
rfkill = devm_kzalloc(&pdev->dev, sizeof(*rfkill), GFP_KERNEL);

0 commit comments

Comments
 (0)