Skip to content

Commit

Permalink
backlight: qcom-wled: Validate enabled string indices in DT
Browse files Browse the repository at this point in the history
The strings passed in DT may possibly cause out-of-bounds register
accesses and should be validated before use.

Fixes: 775d2ff ("backlight: qcom-wled: Restructure the driver for WLED3")
Signed-off-by: Marijn Suijten <[email protected]>
Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
Reviewed-by: Daniel Thompson <[email protected]>
Signed-off-by: Lee Jones <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
  • Loading branch information
MarijnS95 authored and Lee Jones committed Dec 22, 2021
1 parent 6202b5d commit c05b21e
Showing 1 changed file with 17 additions and 1 deletion.
18 changes: 17 additions & 1 deletion drivers/video/backlight/qcom-wled.c
Original file line number Diff line number Diff line change
Expand Up @@ -1528,12 +1528,28 @@ static int wled_configure(struct wled *wled)
string_len = of_property_count_elems_of_size(dev->of_node,
"qcom,enabled-strings",
sizeof(u32));
if (string_len > 0)
if (string_len > 0) {
if (string_len > wled->max_string_count) {
dev_err(dev, "Cannot have more than %d strings\n",
wled->max_string_count);
return -EINVAL;
}

of_property_read_u32_array(dev->of_node,
"qcom,enabled-strings",
wled->cfg.enabled_strings,
sizeof(u32));

for (i = 0; i < string_len; ++i) {
if (wled->cfg.enabled_strings[i] >= wled->max_string_count) {
dev_err(dev,
"qcom,enabled-strings index %d at %d is out of bounds\n",
wled->cfg.enabled_strings[i], i);
return -EINVAL;
}
}
}

return 0;
}

Expand Down

0 comments on commit c05b21e

Please sign in to comment.