drivers: video: backlight: Fix NULL Pointer Dereference in backlight_device_register()
PATCH 1/1 drivers: video: backlight: Fix NULL Pointer Dereference in backlight_device_register()
In the function "wled_probe", the "wled->name" is dynamically allocated (wled_probe -> wled_configure -> devm_kasprintf), which is possible to be null.
In the call trace: wled_probe -> devm_backlight_device_register -> backlight_device_register, this "name" variable is directly dereferenced without checking. We add a null-check statement.
--- drivers/video/backlight/backlight.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/video/backlight/backlight.c +2 -0
@@ -414,6 +414,8 @@ struct backlight_device *backlight_device_register(const char *name,struct backlight_device *new_bd;int rc; +if (!name) +return ERR_PTR (-EINVAL );pr_debug ("backlight_device_register: name=%s\n" , name); new_bd =kzalloc (sizeof (struct backlight_device ),GFP_KERNEL );
Signature · 1 line
2.34.1
Quoted 11 lines · Haoyu Li
In the function "
wled_probe", the "wled->name" is dynamically allocated (wled_probe->wled_configure->devm_kasprintf), which is possible to be null.In the call trace:
wled_probe->devm_backlight_device_register->backlight_device_register, this "name" variable is directly dereferenced without checking. We add a null-check statement.Fixes f86b77583d88 ("backlight: pm8941: Convert to using %pOFn instead of device_node.name")Signed-off-by Haoyu Li <[email protected]>
IMO whoever allocates should be responsible for checking NULL instead of passing NULL around and expecting everyone check their input for NULL.
BR,
Jani.
Quoted 17 lines
--- drivers/video/backlight/backlight.c | 2 ++ 1 file changed, 2 insertions(+)drivers/video/backlight/backlight.c +2
-0@@ -414,6 +414,8 @@ struct backlight_device *backlight_device_register(const char *name,struct backlight_device *new_bd;int rc; +if (!name) +return ERR_PTR (-EINVAL );pr_debug ("backlight_device_register: name=%s\n" , name); new_bd =kzalloc (sizeof (struct backlight_device ),GFP_KERNEL );
Signature · 1 line
Jani Nikula, Intel
Daniel Thompson
maintainerQuoted 9 lines · Jani Nikula
Quoted 8 lines · Haoyu Li
In the function "
wled_probe", the "wled->name" is dynamically allocated (wled_probe->wled_configure->devm_kasprintf), which is possible to be null.In the call trace:
wled_probe->devm_backlight_device_register->backlight_device_register, this "name" variable is directly dereferenced without checking. We add a null-check statement.
Quoted 6 lines
Quoted 3 lines
Fixes f86b77583d88 ("backlight: pm8941: Convert to using %pOFn instead of device_node.name")Signed-off-by Haoyu Li <[email protected]>IMO whoever allocates should be responsible for checking NULL instead of passing NULL around and expecting everyone check their input for NULL.
Agreed. This should be fixed in at callsites.
Daniel.
PATCH 1/1 drivers: video: backlight: Fix NULL Pointer Dereference in backlight_device_register()
As per Jani and Daniel's feedback, I have updated the patch so that the wled->name null check now occurs in the wled_configure function, right after the devm_kasprintf callsite. This should resolve the issue.
The updated patch is as follows:
In the function "wled_probe", the "wled->name" is dynamically allocated (wled_probe -> wled_configure -> devm_kasprintf), and it is possible for it to be NULL.
To avoid dereferencing a NULL pointer (wled_probe -> devm_backlight_device_register -> backlight_device_register), we add a null-check after the allocation rather than in backlight_device_register.
--- drivers/video/backlight/qcom-wled.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/video/backlight/qcom-wled.c +5 -0
@@ -1409,6 +1409,11 @@ static int wled_configure(struct wled *wled)if (rc) wled->name =devm_kasprintf (dev,GFP_KERNEL ,"%pOFn" , dev->of_node); +if (!wled->name) { +dev_err (wled->dev,"Fail to initialize wled name\n" ); +return -EINVAL ; + } +switch (wled->version) {case 3 : u32_opts = wled3_opts;
Signature · 1 line
2.34.1
Hi Haoyu
Quoted 4 lines · Haoyu Li
As per Jani and Daniel's feedback, I have updated the patch so that the
wled->namenull check now occurs in thewled_configurefunction, right after thedevm_kasprintfcallsite. This should resolve the issue.
I'm afraid this patch got swamped in my mailbox and I missed it.
Worse, we've just been discussing and reviewing a patch for the same issue from another developer:
https://lore.kernel.org/all/[email protected]/
So, I just wanted to acknowlege the mistake. Sorry.
Daniel.