]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
greybus: lights: check return of get_channel_from_mode
authorRui Miguel Silva <rmfrfs@gmail.com>
Mon, 25 Mar 2024 22:09:55 +0000 (22:09 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 16 Jun 2024 11:39:34 +0000 (13:39 +0200)
[ Upstream commit a1ba19a1ae7cd1e324685ded4ab563e78fe68648 ]

If channel for the given node is not found we return null from
get_channel_from_mode. Make sure we validate the return pointer
before using it in two of the missing places.

This was originally reported in [0]:
Found by Linux Verification Center (linuxtesting.org) with SVACE.

[0] https://lore.kernel.org/all/20240301190425.120605-1-m.lobanov@rosalinux.ru

Fixes: 2870b52bae4c ("greybus: lights: add lights implementation")
Reported-by: Mikhail Lobanov <m.lobanov@rosalinux.ru>
Suggested-by: Mikhail Lobanov <m.lobanov@rosalinux.ru>
Suggested-by: Alex Elder <elder@ieee.org>
Signed-off-by: Rui Miguel Silva <rmfrfs@gmail.com>
Link: https://lore.kernel.org/r/20240325221549.2185265-1-rmfrfs@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/staging/greybus/light.c

index c6bd86a5335ab52d6331262c20a28b7f94b9e9d1..9999f84016992a680baa1c315f02a2c75373064f 100644 (file)
@@ -147,6 +147,9 @@ static int __gb_lights_flash_brightness_set(struct gb_channel *channel)
                channel = get_channel_from_mode(channel->light,
                                                GB_CHANNEL_MODE_TORCH);
 
+       if (!channel)
+               return -EINVAL;
+
        /* For not flash we need to convert brightness to intensity */
        intensity = channel->intensity_uA.min +
                        (channel->intensity_uA.step * channel->led->brightness);
@@ -549,7 +552,10 @@ static int gb_lights_light_v4l2_register(struct gb_light *light)
        }
 
        channel_flash = get_channel_from_mode(light, GB_CHANNEL_MODE_FLASH);
-       WARN_ON(!channel_flash);
+       if (!channel_flash) {
+               dev_err(dev, "failed to get flash channel from mode\n");
+               return -EINVAL;
+       }
 
        fled = &channel_flash->fled;