Commit 045391a0 authored by Kees Cook's avatar Kees Cook Committed by Lee Jones

leds: gpio: Set num_leds after allocation

With the new __counted_by annotation, the "num_leds" variable needs to
valid for accesses to the "leds" array. This requirement is not met in
gpio_leds_create(), since "num_leds" starts at "0", so "leds" index "0"
will not be considered valid (num_leds would need to be "1" to access
index "0").

Fix this by setting the allocation size after allocation, and then update
the final count based on how many were actually added to the array.

Fixes: 52cd7510 ("leds: gpio: Annotate struct gpio_leds_priv with __counted_by")
Signed-off-by: default avatarKees Cook <kees@kernel.org>
Reviewed-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Link: https://lore.kernel.org/r/20240716212455.work.809-kees@kernel.orgSigned-off-by: default avatarLee Jones <lee@kernel.org>
parent e5ae4083
...@@ -150,7 +150,7 @@ static struct gpio_leds_priv *gpio_leds_create(struct device *dev) ...@@ -150,7 +150,7 @@ static struct gpio_leds_priv *gpio_leds_create(struct device *dev)
{ {
struct fwnode_handle *child; struct fwnode_handle *child;
struct gpio_leds_priv *priv; struct gpio_leds_priv *priv;
int count, ret; int count, used, ret;
count = device_get_child_node_count(dev); count = device_get_child_node_count(dev);
if (!count) if (!count)
...@@ -159,9 +159,11 @@ static struct gpio_leds_priv *gpio_leds_create(struct device *dev) ...@@ -159,9 +159,11 @@ static struct gpio_leds_priv *gpio_leds_create(struct device *dev)
priv = devm_kzalloc(dev, struct_size(priv, leds, count), GFP_KERNEL); priv = devm_kzalloc(dev, struct_size(priv, leds, count), GFP_KERNEL);
if (!priv) if (!priv)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
priv->num_leds = count;
used = 0;
device_for_each_child_node(dev, child) { device_for_each_child_node(dev, child) {
struct gpio_led_data *led_dat = &priv->leds[priv->num_leds]; struct gpio_led_data *led_dat = &priv->leds[used];
struct gpio_led led = {}; struct gpio_led led = {};
/* /*
...@@ -197,8 +199,9 @@ static struct gpio_leds_priv *gpio_leds_create(struct device *dev) ...@@ -197,8 +199,9 @@ static struct gpio_leds_priv *gpio_leds_create(struct device *dev)
/* Set gpiod label to match the corresponding LED name. */ /* Set gpiod label to match the corresponding LED name. */
gpiod_set_consumer_name(led_dat->gpiod, gpiod_set_consumer_name(led_dat->gpiod,
led_dat->cdev.dev->kobj.name); led_dat->cdev.dev->kobj.name);
priv->num_leds++; used++;
} }
priv->num_leds = used;
return priv; return priv;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment