Skip to contentSkip to conversation

leds: is31fl32xx: Fix NULL pointer dereference when binding via I2C ID table

PATCH Applied Rosen Penev 3 participants 3 messages Oct 18 – Oct 28 LED

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 leds: is31fl32xx: Fix NULL pointer dereference when binding via I2C ID table

If the device binds via the I2C ID table (e.g. sysfs new_device, a software node, or a firmware node without a matching compatible), device_get_match_data() in is31fl32xx_probe() returns NULL, since only the OF match table carries the chip definition. is31fl32xx_parse_dt() then dereferences cdef->output_frequency_setting_reg and is31fl32xx_parse_child_dt() dereferences cdef->channels, causing a kernel oops.

Populate .driver_data in is31fl32xx_id with the same chip definitions as the OF table and use i2c_get_match_data(), which falls back to the I2C ID table when no firmware match data is available. Every entry now carries match data, so cdef can no longer be NULL.

Drop the comment above the ID table, as the table is now used for matching data as well.

Fixes 2779f4724b2f ("leds: various: use device_get_match_data")

---
v3: use named initializers
v2: use i2c_get_match_data()

 drivers/leds/leds-is31fl32xx.c | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)
drivers/leds/leds-is31fl32xx.c +9 -13
index 285085d27453..1c5169cc72c5 100644
@@ -574,7 +574,7 @@ static int is31fl32xx_probe(struct i2c_client *client)
 	int count;
 	int ret = 0;
 
-	cdef = device_get_match_data(dev);
+	cdef = i2c_get_match_data(client);
 
 	count = device_get_child_node_count(dev);
 	if (!count)
@@ -611,19 +611,15 @@ static void is31fl32xx_remove(struct i2c_client *client)
 			ERR_PTR(ret));
 }
 
-/*
- * i2c-core (and modalias) requires that id_table be properly filled,
- * even though it is not used for DeviceTree based instantiation.
- */
 static const struct i2c_device_id is31fl32xx_id[] = {
-	{ .name = "is31fl3293" },
-	{ .name = "is31fl3236" },
-	{ .name = "is31fl3236a" },
-	{ .name = "is31fl3235" },
-	{ .name = "is31fl3218" },
-	{ .name = "sn3218" },
-	{ .name = "is31fl3216" },
-	{ .name = "sn3216" },
+	{ .name = "is31fl3293", .driver_data = (kernel_ulong_t)&is31fl3293_cdef },
+	{ .name = "is31fl3236", .driver_data = (kernel_ulong_t)&is31fl3236_cdef },
+	{ .name = "is31fl3236a", .driver_data = (kernel_ulong_t)&is31fl3236a_cdef },
+	{ .name = "is31fl3235", .driver_data = (kernel_ulong_t)&is31fl3235_cdef },
+	{ .name = "is31fl3218", .driver_data = (kernel_ulong_t)&is31fl3218_cdef },
+	{ .name = "sn3218", .driver_data = (kernel_ulong_t)&is31fl3218_cdef },
+	{ .name = "is31fl3216", .driver_data = (kernel_ulong_t)&is31fl3216_cdef },
+	{ .name = "sn3216", .driver_data = (kernel_ulong_t)&is31fl3216_cdef },
 	{ }
 };
 
Signature · 1 line
2.56.0
#1 lore raw
Sashiko has reviewed this patch and found no issues.
Quoted 13 lines

If the device binds via the I2C ID table (e.g. sysfs new_device, a software node, or a firmware node without a matching compatible), device_get_match_data() in is31fl32xx_probe() returns NULL, since only the OF match table carries the chip definition. is31fl32xx_parse_dt() then dereferences cdef->output_frequency_setting_reg and is31fl32xx_parse_child_dt() dereferences cdef->channels, causing a kernel oops.

Populate .driver_data in is31fl32xx_id with the same chip definitions as the OF table and use i2c_get_match_data(), which falls back to the I2C ID table when no firmware match data is available. Every entry now carries match data, so cdef can no longer be NULL.

Quoted 6 lines

Drop the comment above the ID table, as the table is now used for matching data as well.

Fixes 2779f4724b2f ("leds: various: use device_get_match_data")

Sashiko has reviewed this patch and found no issues.

Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
maintainer Applied
#2 lore raw

Re: (subset) [PATCH v3] leds: is31fl32xx: Fix NULL pointer dereference when binding via I2C ID table

In reply to Rosen Penev
Quoted 9 lines · Rosen Penev

If the device binds via the I2C ID table (e.g. sysfs new_device, a software node, or a firmware node without a matching compatible), device_get_match_data() in is31fl32xx_probe() returns NULL, since only the OF match table carries the chip definition. is31fl32xx_parse_dt() then dereferences cdef->output_frequency_setting_reg and is31fl32xx_parse_child_dt() dereferences cdef->channels, causing a kernel oops.

[...]

Applied, thanks!

[1/1] leds: is31fl32xx: Fix NULL pointer dereference when binding via I2C ID table

      commit: add6cef9f655ba85155c1afc554c3856ab164660

--
Lee Jones [李琼斯]