Skip to content

Commit c72e455

Browse files
innovaralag-linaro
authored andcommitted
leds: leds-st1202: Fix NULL pointer access on race condition
st1202_dt_init() calls devm_led_classdev_register_ext() before the internal data structures are properly set up, so the LEDs become visible to user space while being partially initialized, leading to a window where trying to access them causes a NULL pointer access. Move devm_led_classdev_register_ext() from DT initialization to the end of the probe function when DT and hardware are fully initialized and ready to interact with user space. Fixes: 2592303 ("leds: Add LED1202 I2C driver") Signed-off-by: Manuel Fombuena <fombuena@outlook.com> Link: https://lore.kernel.org/r/CWLP123MB54732771AC0CE5491B3C84DCC5C32@CWLP123MB5473.GBRP123.PROD.OUTLOOK.COM Signed-off-by: Lee Jones <lee@kernel.org>
1 parent 2014c95 commit c72e455

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

drivers/leds/leds-st1202.c

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,6 @@ static int st1202_dt_init(struct st1202_chip *chip)
261261
int err, reg;
262262

263263
for_each_available_child_of_node_scoped(dev_of_node(dev), child) {
264-
struct led_init_data init_data = {};
265-
266264
err = of_property_read_u32(child, "reg", &reg);
267265
if (err)
268266
return dev_err_probe(dev, err, "Invalid register\n");
@@ -276,15 +274,6 @@ static int st1202_dt_init(struct st1202_chip *chip)
276274
led->led_cdev.pattern_set = st1202_led_pattern_set;
277275
led->led_cdev.pattern_clear = st1202_led_pattern_clear;
278276
led->led_cdev.default_trigger = "pattern";
279-
280-
init_data.fwnode = led->fwnode;
281-
init_data.devicename = "st1202";
282-
init_data.default_label = ":";
283-
284-
err = devm_led_classdev_register_ext(dev, &led->led_cdev, &init_data);
285-
if (err < 0)
286-
return dev_err_probe(dev, err, "Failed to register LED class device\n");
287-
288277
led->led_cdev.brightness_set = st1202_brightness_set;
289278
led->led_cdev.brightness_get = st1202_brightness_get;
290279
}
@@ -368,6 +357,7 @@ static int st1202_probe(struct i2c_client *client)
368357
return ret;
369358

370359
for (int i = 0; i < ST1202_MAX_LEDS; i++) {
360+
struct led_init_data init_data = {};
371361
led = &chip->leds[i];
372362
led->chip = chip;
373363
led->led_num = i;
@@ -384,6 +374,15 @@ static int st1202_probe(struct i2c_client *client)
384374
if (ret < 0)
385375
return dev_err_probe(&client->dev, ret,
386376
"Failed to clear LED pattern\n");
377+
378+
init_data.fwnode = led->fwnode;
379+
init_data.devicename = "st1202";
380+
init_data.default_label = ":";
381+
382+
ret = devm_led_classdev_register_ext(&client->dev, &led->led_cdev, &init_data);
383+
if (ret < 0)
384+
return dev_err_probe(&client->dev, ret,
385+
"Failed to register LED class device\n");
387386
}
388387

389388
return 0;

0 commit comments

Comments
 (0)