greybus-dev

greybus-dev@lists.linaro.org

16 participants
822 discussions

[Patch v2] staging: greybus: Replace gcam macros with direct dev log calls

by Jackson Chui

Reported by checkpatch: CHECK: Macro argument 'gcam' may be better as '(gcam)' to avoid precedence issues Inline standard calls to 'dev_*' kernel logging functions, in favor of 'gcam_*' macros, to clear up gcam-related logging. Signed-off-by: Jackson Chui <jacksonchui.qwerty(a)gmail.com> --- Changes in v2: - Inline 'dev_*' logging functions, over wrappers and macros to just use the standard call. - Remove 'gcam_*' macros, since they are no longer used. --- drivers/staging/greybus/camera.c | 58 +++++++++++++++----------------- 1 file changed, 27 insertions(+), 31 deletions(-) diff --git a/drivers/staging/greybus/camera.c b/drivers/staging/greybus/camera.c index a8173aa3a995..b8b2bdfa59e5 100644 --- a/drivers/staging/greybus/camera.c +++ b/drivers/staging/greybus/camera.c @@ -180,10 +180,6 @@ static const struct gb_camera_fmt_info *gb_camera_get_format_info(u16 gb_fmt) #define GB_CAMERA_MAX_SETTINGS_SIZE 8192 -#define gcam_dbg(gcam, format...) dev_dbg(&gcam->bundle->dev, format) -#define gcam_info(gcam, format...) dev_info(&gcam->bundle->dev, format) -#define gcam_err(gcam, format...) dev_err(&gcam->bundle->dev, format) - static int gb_camera_operation_sync_flags(struct gb_connection *connection, int type, unsigned int flags, void *request, size_t request_size, @@ -232,8 +228,8 @@ static int gb_camera_get_max_pkt_size(struct gb_camera *gcam, fmt_info = gb_camera_get_format_info(cfg->format); if (!fmt_info) { - gcam_err(gcam, "unsupported greybus image format: %d\n", - cfg->format); + dev_err(&gcam->bundle->dev, "unsupported greybus image format: %d\n", + cfg->format); return -EIO; } @@ -241,18 +237,18 @@ static int gb_camera_get_max_pkt_size(struct gb_camera *gcam, pkt_size = le32_to_cpu(cfg->max_pkt_size); if (pkt_size == 0) { - gcam_err(gcam, - "Stream %u: invalid zero maximum packet size\n", - i); + dev_err(&gcam->bundle->dev, + "Stream %u: invalid zero maximum packet size\n", + i); return -EIO; } } else { pkt_size = le16_to_cpu(cfg->width) * fmt_info->bpp / 8; if (pkt_size != le32_to_cpu(cfg->max_pkt_size)) { - gcam_err(gcam, - "Stream %u: maximum packet size mismatch (%u/%u)\n", - i, pkt_size, cfg->max_pkt_size); + dev_err(&gcam->bundle->dev, + "Stream %u: maximum packet size mismatch (%u/%u)\n", + i, pkt_size, cfg->max_pkt_size); return -EIO; } } @@ -275,13 +271,13 @@ static const int gb_camera_configure_streams_validate_response(struct gb_camera /* Validate the returned response structure */ if (resp->padding[0] || resp->padding[1]) { - gcam_err(gcam, "response padding != 0\n"); + dev_err(&gcam->bundle->dev, "response padding != 0\n"); return -EIO; } if (resp->num_streams > nstreams) { - gcam_err(gcam, "got #streams %u > request %u\n", - resp->num_streams, nstreams); + dev_err(&gcam->bundle->dev, "got #streams %u > request %u\n", + resp->num_streams, nstreams); return -EIO; } @@ -289,7 +285,7 @@ static const int gb_camera_configure_streams_validate_response(struct gb_camera struct gb_camera_stream_config_response *cfg = &resp->config[i]; if (cfg->padding) { - gcam_err(gcam, "stream #%u padding != 0\n", i); + dev_err(&gcam->bundle->dev, "stream #%u padding != 0\n", i); return -EIO; } } @@ -340,16 +336,16 @@ static int gb_camera_set_power_mode(struct gb_camera *gcam, bool hs) ret = gb_camera_set_intf_power_mode(gcam, intf->interface_id, hs); if (ret < 0) { - gcam_err(gcam, "failed to set module interface to %s (%d)\n", - hs ? "HS" : "PWM", ret); + dev_err(&gcam->bundle->dev, "failed to set module interface to %s (%d)\n", + hs ? "HS" : "PWM", ret); return ret; } ret = gb_camera_set_intf_power_mode(gcam, svc->ap_intf_id, hs); if (ret < 0) { gb_camera_set_intf_power_mode(gcam, intf->interface_id, !hs); - gcam_err(gcam, "failed to set AP interface to %s (%d)\n", - hs ? "HS" : "PWM", ret); + dev_err(&gcam->bundle->dev, "failed to set AP interface to %s (%d)\n", + hs ? "HS" : "PWM", ret); return ret; } @@ -435,7 +431,7 @@ static int gb_camera_setup_data_connection(struct gb_camera *gcam, sizeof(csi_cfg), GB_APB_REQUEST_CSI_TX_CONTROL, false); if (ret < 0) { - gcam_err(gcam, "failed to start the CSI transmitter\n"); + dev_err(&gcam->bundle->dev, "failed to start the CSI transmitter\n"); goto error_power; } @@ -470,7 +466,7 @@ static void gb_camera_teardown_data_connection(struct gb_camera *gcam) GB_APB_REQUEST_CSI_TX_CONTROL, false); if (ret < 0) - gcam_err(gcam, "failed to stop the CSI transmitter\n"); + dev_err(&gcam->bundle->dev, "failed to stop the CSI transmitter\n"); /* Set the UniPro link to low speed mode. */ gb_camera_set_power_mode(gcam, false); @@ -507,7 +503,7 @@ static int gb_camera_capabilities(struct gb_camera *gcam, NULL, 0, (void *)capabilities, size); if (ret) - gcam_err(gcam, "failed to retrieve capabilities: %d\n", ret); + dev_err(&gcam->bundle->dev, "failed to retrieve capabilities: %d\n", ret); done: mutex_unlock(&gcam->mutex); @@ -723,22 +719,22 @@ static int gb_camera_request_handler(struct gb_operation *op) struct gb_message *request; if (op->type != GB_CAMERA_TYPE_METADATA) { - gcam_err(gcam, "Unsupported unsolicited event: %u\n", op->type); + dev_err(&gcam->bundle->dev, "Unsupported unsolicited event: %u\n", op->type); return -EINVAL; } request = op->request; if (request->payload_size < sizeof(*payload)) { - gcam_err(gcam, "Wrong event size received (%zu < %zu)\n", - request->payload_size, sizeof(*payload)); + dev_err(&gcam->bundle->dev, "Wrong event size received (%zu < %zu)\n", + request->payload_size, sizeof(*payload)); return -EINVAL; } payload = request->payload; - gcam_dbg(gcam, "received metadata for request %u, frame %u, stream %u\n", - payload->request_id, payload->frame_number, payload->stream); + dev_dbg(&gcam->bundle->dev, "received metadata for request %u, frame %u, stream %u\n", + payload->request_id, payload->frame_number, payload->stream); return 0; } @@ -1347,15 +1343,15 @@ static int gb_camera_resume(struct device *dev) ret = gb_connection_enable(gcam->connection); if (ret) { - gcam_err(gcam, "failed to enable connection: %d\n", ret); + dev_err(&gcam->bundle->dev, "failed to enable connection: %d\n", ret); return ret; } if (gcam->data_connection) { ret = gb_connection_enable(gcam->data_connection); if (ret) { - gcam_err(gcam, - "failed to enable data connection: %d\n", ret); + dev_err(&gcam->bundle->dev, + "failed to enable data connection: %d\n", ret); return ret; } } -- 2.34.1

2 years, 3 months

[PATCH v1] greybus: Fix use-after-free bug in gb_interface_release due to race condition.

by Sicong Huang

In gb_interface_create, &intf->mode_switch_completion is bound with gb_interface_mode_switch_work. Then it will be started by gb_interface_request_mode_switch. Here is the relevant code. if (!queue_work(system_long_wq, &intf->mode_switch_work)) { ... } If we call gb_interface_release to make cleanup, there may be an unfinished work. This function will call kfree to free the object "intf". However, if gb_interface_mode_switch_work is scheduled to run after kfree, it may cause use-after-free error as gb_interface_mode_switch_work will use the object "intf". The possible execution flow that may lead to the issue is as follows: CPU0 CPU1 | gb_interface_create | gb_interface_request_mode_switch gb_interface_release | kfree(intf) (free) | | gb_interface_mode_switch_work | mutex_lock(&intf->mutex) (use) Fix it by canceling the work before kfree. Signed-off-by: Sicong Huang <congei42(a)163.com> --- drivers/greybus/interface.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/greybus/interface.c b/drivers/greybus/interface.c index fd58a86b0888..d022bfb5e95d 100644 --- a/drivers/greybus/interface.c +++ b/drivers/greybus/interface.c @@ -693,6 +693,7 @@ static void gb_interface_release(struct device *dev) trace_gb_interface_release(intf); + cancel_work_sync(&intf->mode_switch_work); kfree(intf); } -- 2.34.1

2 years, 3 months

Re: Bug report: greybus/interface.c: use-after-free bug in gb_interface_release due to race condition

by Greg KH

On Tue, Apr 16, 2024 at 11:00:25AM +0800, sicong wrote: > greybus/interface.c: use-after-free bug in gb_interface_release due to > race condition. > > In gb_interface_create, &intf->mode_switch_completion is bound with > gb_interface_mode_switch_work. Then it will be started by > gb_interface_request_mode_switch. Here is the code. > if (!queue_work(system_long_wq, &intf->mode_switch_work)) { > ... > } > > If we call gb_interface_release to make cleanup, there may be an > unfinished work. This function will call kfree to free the object > "intf". However, if gb_interface_mode_switch_work is scheduled to > run after kfree, it may cause use-after-free error as > gb_interface_mode_switch_work will use the object "intf". > The possible execution flow that may lead to the issue is as follows: > > CPU0 CPU1 > > | gb_interface_create > | gb_interface_request_mode_switch > gb_interface_release | > kfree(intf) (free) | > | gb_interface_mode_switch_work > | mutex_lock(&intf->mutex) (use) > > This bug may be fixed by adding the following code before kfree. > cancel_work_sync(&intf->mode_switch_work); Wonderful, please submit a patch with this information and we will be glad to review it. thanks, greg k-h

2 years, 3 months

[PATCH v3 0/8] misc: Add mikroBUS driver

by Ayush Singh

MikroBUS is an open standard developed by MikroElektronika for connecting add-on boards to microcontrollers or microprocessors. It essentially allows you to easily expand the functionality of your main boards using these add-on boards. This patchset adds mikroBUS as a Linux bus type and provides a driver to parse, and flash mikroBUS manifest and register the mikroBUS board. The v1 and v2 of this patchset was submitted by Vaishnav M A back in 2020. This patchset also includes changes made over the years as part of BeagleBoards kernel. Link: https://www.mikroe.com/mikrobus Link: https://docs.beagleboard.org/latest/boards/beagleplay/ Link: https://lore.kernel.org/lkml/20200818124815.11029-1-vaishnav@beagleboard.or… Patch v2 Changes in v3: - Use phandle instead of busname for spi - Use spi board info for registering new device - Convert dt bindings to yaml - Add support for clickID - Code cleanup and style changes - Additions required to spi, serdev, w1 and regulator subsystems Changes in v2: - support for adding mikroBUS ports from DT overlays, - remove debug sysFS interface for adding mikrobus ports, - consider extended pin usage/deviations from mikrobus standard specifications - use greybus CPort protocol enum instead of new protocol enums - Fix cases of wrong indentation, ignoring return values, freeing allocated resources in case of errors and other style suggestions in v1 review. Ayush Singh (7): dt-bindings: misc: Add mikrobus-connector w1: Add w1_find_master_device spi: Make of_find_spi_controller_by_node() available regulator: fixed-helper: export regulator_register_always_on greybus: Add mikroBUS manifest types mikrobus: Add mikrobus driver dts: ti: k3-am625-beagleplay: Add mikroBUS Vaishnav M A (1): serdev: add of_ helper to get serdev controller .../bindings/misc/mikrobus-connector.yaml | 110 ++ MAINTAINERS | 7 + .../arm64/boot/dts/ti/k3-am625-beagleplay.dts | 76 +- drivers/misc/Kconfig | 1 + drivers/misc/Makefile | 1 + drivers/misc/mikrobus/Kconfig | 19 + drivers/misc/mikrobus/Makefile | 6 + drivers/misc/mikrobus/mikrobus_core.c | 942 ++++++++++++++++++ drivers/misc/mikrobus/mikrobus_core.h | 201 ++++ drivers/misc/mikrobus/mikrobus_id.c | 229 +++++ drivers/misc/mikrobus/mikrobus_manifest.c | 502 ++++++++++ drivers/misc/mikrobus/mikrobus_manifest.h | 20 + drivers/regulator/fixed-helper.c | 1 + drivers/spi/spi.c | 206 ++-- drivers/tty/serdev/core.c | 19 + drivers/w1/w1.c | 6 +- drivers/w1/w1_int.c | 27 + include/linux/greybus/greybus_manifest.h | 49 + include/linux/serdev.h | 4 + include/linux/spi/spi.h | 4 + include/linux/w1.h | 1 + 21 files changed, 2318 insertions(+), 113 deletions(-) create mode 100644 Documentation/devicetree/bindings/misc/mikrobus-connector.yaml create mode 100644 drivers/misc/mikrobus/Kconfig create mode 100644 drivers/misc/mikrobus/Makefile create mode 100644 drivers/misc/mikrobus/mikrobus_core.c create mode 100644 drivers/misc/mikrobus/mikrobus_core.h create mode 100644 drivers/misc/mikrobus/mikrobus_id.c create mode 100644 drivers/misc/mikrobus/mikrobus_manifest.c create mode 100644 drivers/misc/mikrobus/mikrobus_manifest.h base-commit: 61996c073c9b070922ad3a36c981ca6ddbea19a5 -- 2.44.0

2 years, 3 months

[PATCH 00/11] address remaining stringop-truncation warnings

by Arnd Bergmann

From: Arnd Bergmann <arnd(a)arndb.de> We are close to being able to turn on -Wstringop-truncation unconditionally instead of only at the 'make W=1' level, these ten warnings are all that I saw in randconfig testing across compiler versions on arm, arm64 and x86. The final patch is only there for reference at the moment, I hope we can merge the other ones through the subsystem trees first, as there are no dependencies between them. Arnd Arnd Bergmann (11): staging: vc04_services: changen strncpy() to strscpy_pad() scsi: devinfo: rework scsi_strcpy_devinfo() staging: replace weird strncpy() with memcpy() orangefs: convert strncpy() to strscpy() test_hexdump: avoid string truncation warning acpi: avoid warning for truncated string copy block/partitions/ldm: convert strncpy() to strscpy() blktrace: convert strncpy() to strscpy_pad() staging: rtl8723bs: convert strncpy to strscpy staging: greybus: change strncpy() to strscpy() kbuild: enable -Wstringop-truncation globally block/partitions/ldm.c | 6 ++-- drivers/acpi/acpica/tbfind.c | 19 +++++------ drivers/scsi/scsi_devinfo.c | 30 +++++++++++------ drivers/staging/greybus/fw-management.c | 4 +-- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 5 ++- drivers/staging/rts5208/rtsx_scsi.c | 2 +- .../vc04_services/vchiq-mmal/mmal-vchiq.c | 4 +-- fs/orangefs/dcache.c | 4 +-- fs/orangefs/namei.c | 33 +++++++++---------- fs/orangefs/super.c | 16 ++++----- kernel/trace/blktrace.c | 3 +- lib/test_hexdump.c | 2 +- scripts/Makefile.extrawarn | 1 - 13 files changed, 64 insertions(+), 65 deletions(-) -- 2.39.2 Cc: "Richard Russon Cc: Jens Axboe <axboe(a)kernel.dk> Cc: Robert Moore <robert.moore(a)intel.com> Cc: "Rafael J. Wysocki" <rafael.j.wysocki(a)intel.com> Cc: Len Brown <lenb(a)kernel.org> Cc: "James E.J. Bottomley" <jejb(a)linux.ibm.com> Cc: "Martin K. Petersen" <martin.petersen(a)oracle.com> Cc: Viresh Kumar <vireshk(a)kernel.org> Cc: Johan Hovold <johan(a)kernel.org> Cc: Alex Elder <elder(a)kernel.org> Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Cc: Florian Fainelli <florian.fainelli(a)broadcom.com> Cc: Broadcom internal kernel review list <bcm-kernel-feedback-list(a)broadcom.com> Cc: Mike Marshall <hubcap(a)omnibond.com> Cc: Martin Brandenburg <martin(a)omnibond.com> Cc: Steven Rostedt <rostedt(a)goodmis.org> Cc: Masami Hiramatsu <mhiramat(a)kernel.org> Cc: Mathieu Desnoyers <mathieu.desnoyers(a)efficios.com> Cc: Andrew Morton <akpm(a)linux-foundation.org> Cc: Masahiro Yamada <masahiroy(a)kernel.org> Cc: Nathan Chancellor <nathan(a)kernel.org> Cc: Nicolas Schier <nicolas(a)fjasle.eu> Cc: Arnd Bergmann <arnd(a)arndb.de> Cc: Kees Cook <keescook(a)chromium.org> Cc: Alexey Starikovskiy <astarikovskiy(a)suse.de> Cc: linux-ntfs-dev(a)lists.sourceforge.net Cc: linux-block(a)vger.kernel.org Cc: linux-kernel(a)vger.kernel.org Cc: linux-acpi(a)vger.kernel.org Cc: acpica-devel(a)lists.linux.dev Cc: linux-scsi(a)vger.kernel.org Cc: greybus-dev(a)lists.linaro.org Cc: linux-staging(a)lists.linux.dev Cc: linux-rpi-kernel(a)lists.infradead.org Cc: linux-arm-kernel(a)lists.infradead.org Cc: devel(a)lists.orangefs.org Cc: linux-trace-kernel(a)vger.kernel.org Cc: linux-kbuild(a)vger.kernel.org

2 years, 3 months

[PATCH 3/3] [v2] staging: greybus: change strncpy() to strscpy_pad()

by Arnd Bergmann

From: Arnd Bergmann <arnd(a)arndb.de> gcc-10 warns about a strncpy() that does not enforce zero-termination: In file included from include/linux/string.h:369, from drivers/staging/greybus/fw-management.c:9: In function 'strncpy', inlined from 'fw_mgmt_backend_fw_update_operation' at drivers/staging/greybus/fw-management.c:306:2: include/linux/fortify-string.h:108:30: error: '__builtin_strncpy' specified bound 10 equals destination size [-Werror=stringop-truncation] 108 | #define __underlying_strncpy __builtin_strncpy | ^ include/linux/fortify-string.h:187:9: note: in expansion of macro '__underlying_strncpy' 187 | return __underlying_strncpy(p, q, size); | ^~~~~~~~~~~~~~~~~~~~ For some reason, I cannot reproduce this with gcc-9 or gcc-11, and I only get a warning for one of the four related strncpy()s, so I'm not sure what's going on. Change all four to strscpy_pad(), which is the safest replacement here, as it avoids ending up with uninitialized stack data in the tag name. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- v2 - use strscpy_pad() - use two-argument form - change all four instances, not just the one that produced the warning --- drivers/staging/greybus/fw-management.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/staging/greybus/fw-management.c b/drivers/staging/greybus/fw-management.c index 3054f084d777..a47385175582 100644 --- a/drivers/staging/greybus/fw-management.c +++ b/drivers/staging/greybus/fw-management.c @@ -123,8 +123,7 @@ static int fw_mgmt_interface_fw_version_operation(struct fw_mgmt *fw_mgmt, fw_info->major = le16_to_cpu(response.major); fw_info->minor = le16_to_cpu(response.minor); - strncpy(fw_info->firmware_tag, response.firmware_tag, - GB_FIRMWARE_TAG_MAX_SIZE); + strscpy_pad(fw_info->firmware_tag, response.firmware_tag); /* * The firmware-tag should be NULL terminated, otherwise throw error but @@ -153,7 +152,7 @@ static int fw_mgmt_load_and_validate_operation(struct fw_mgmt *fw_mgmt, } request.load_method = load_method; - strncpy(request.firmware_tag, tag, GB_FIRMWARE_TAG_MAX_SIZE); + strscpy_pad(request.firmware_tag, tag); /* * The firmware-tag should be NULL terminated, otherwise throw error and @@ -249,8 +248,7 @@ static int fw_mgmt_backend_fw_version_operation(struct fw_mgmt *fw_mgmt, struct gb_fw_mgmt_backend_fw_version_response response; int ret; - strncpy(request.firmware_tag, fw_info->firmware_tag, - GB_FIRMWARE_TAG_MAX_SIZE); + strscpy_pad(request.firmware_tag, fw_info->firmware_tag); /* * The firmware-tag should be NULL terminated, otherwise throw error and @@ -303,13 +301,13 @@ static int fw_mgmt_backend_fw_update_operation(struct fw_mgmt *fw_mgmt, struct gb_fw_mgmt_backend_fw_update_request request; int ret; - strncpy(request.firmware_tag, tag, GB_FIRMWARE_TAG_MAX_SIZE); + ret = strscpy_pad(request.firmware_tag, tag); /* * The firmware-tag should be NULL terminated, otherwise throw error and * fail. */ - if (request.firmware_tag[GB_FIRMWARE_TAG_MAX_SIZE - 1] != '\0') { + if (ret == -E2BIG) { dev_err(fw_mgmt->parent, "backend-update: firmware-tag is not NULL terminated\n"); return -EINVAL; } -- 2.39.2

2 years, 3 months

[PATCH] staging: greybus: Clear up precedence for gcam logging macros

by Jackson Chui

Reported by checkpatch: CHECK: Macro argument 'gcam' may be better as '(gcam)' to avoid precedence issues Disambiguates '&' (address-of) operator and '->' operator precedence, accounting for how '(gcam)->bundle->dev' is a 'struct device' and not a 'struct device*', which is required by the dev_{dbg,info,err} driver model diagnostic macros. Issue found by checkpatch. Signed-off-by: Jackson Chui <jacksonchui.qwerty(a)gmail.com> --- drivers/staging/greybus/camera.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/greybus/camera.c b/drivers/staging/greybus/camera.c index a8173aa3a995..d82a2d2abdca 100644 --- a/drivers/staging/greybus/camera.c +++ b/drivers/staging/greybus/camera.c @@ -180,9 +180,9 @@ static const struct gb_camera_fmt_info *gb_camera_get_format_info(u16 gb_fmt) #define GB_CAMERA_MAX_SETTINGS_SIZE 8192 -#define gcam_dbg(gcam, format...) dev_dbg(&gcam->bundle->dev, format) -#define gcam_info(gcam, format...) dev_info(&gcam->bundle->dev, format) -#define gcam_err(gcam, format...) dev_err(&gcam->bundle->dev, format) +#define gcam_dbg(gcam, format...) dev_dbg(&((gcam)->bundle->dev), format) +#define gcam_info(gcam, format...) dev_info(&((gcam)->bundle->dev), format) +#define gcam_err(gcam, format...) dev_err(&((gcam)->bundle->dev), format) static int gb_camera_operation_sync_flags(struct gb_connection *connection, int type, unsigned int flags, -- 2.34.1

2 years, 3 months

[PATCH v2] greybus: lights: check return of get_channel_from_mode

by Rui Miguel Silva

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(a)rosalinux.ru> Suggested-by: Mikhail Lobanov <m.lobanov(a)rosalinux.ru> Suggested-by: Alex Elder <elder(a)ieee.org> Signed-off-by: Rui Miguel Silva <rmfrfs(a)gmail.com> --- v1[1] -> v2: GregKh: - remove overkill WARN_ON and replace it for a dev_err [1]: https://lore.kernel.org/all/20240307094838.688281-1-rmfrfs@gmail.com/ drivers/staging/greybus/light.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/staging/greybus/light.c b/drivers/staging/greybus/light.c index c6bd86a5335a..9999f8401699 100644 --- a/drivers/staging/greybus/light.c +++ b/drivers/staging/greybus/light.c @@ -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; -- 2.44.0

2 years, 4 months

[PATCH] greybus: lights: check return of get_channel_from_mode

by Rui Miguel Silva

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(a)rosalinux.ru> Suggested-by: Mikhail Lobanov <m.lobanov(a)rosalinux.ru> Suggested-by: Alex Elder <elder(a)ieee.org> Signed-off-by: Rui Miguel Silva <rmfrfs(a)gmail.com> --- drivers/staging/greybus/light.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/staging/greybus/light.c b/drivers/staging/greybus/light.c index c6bd86a5335a..6f10b9e2c053 100644 --- a/drivers/staging/greybus/light.c +++ b/drivers/staging/greybus/light.c @@ -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,8 @@ 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 (WARN_ON(!channel_flash)) + return -EINVAL; fled = &channel_flash->fled; -- 2.44.0

2 years, 4 months

[PATCH v6 000/164] pwm: Improve lifetime tracking for pwm_chips

by Uwe Kleine-König

Hello, this is v6 of the series introducing better lifetime tracking for pwmchips that addresses (for now theoretic) lifetime issues of pwm chips. Addressing these is a necessary precondition to introduce chardev support for PWMs. Locking got more complicated due to non-sleeping chips, so I dropped the character device patch because it got still more incomplete now. Also I'm not yet entirely sure about patches #162 and #163 and I expect them to change before they can go in. My plan for the next merge window is to get the patches in up to #160. After that the addition of chardev support (including correct locking) can continue without having to touch the lowlevel driver. So the idea of this series is to get the driver adaptions out of the way as this requires some cross-tree coordination. The patches that touch files outside of drivers/pwm include: - gpio: mvebu: Make use of devm_pwmchip_alloc() function It already has an Ack by Linus Walleij. - drm/bridge: ti-sn65dsi86: Make use of pwmchip_parent() accessor - drm/bridge: ti-sn65dsi86: Make use of devm_pwmchip_alloc() function The 2nd already has an Ack by Douglas Anderson which I tend to assume good enough to merge this via my pwm tree, too. An Ack for the first patch would be nice. - leds: qcom-lpg: Make use of devm_pwmchip_alloc() function Already has an Ack by Lee Jones. - staging: greybus: pwm: Change prototype of helpers to prepare further changes - staging: greybus: pwm: Make use of pwmchip_parent() accessor - staging: greybus: pwm: Rely on pwm framework to pass a valid hwpwm - staging: greybus: pwm: Drop unused gb_connection_set_data() - staging: greybus: pwm: Rework how the number of PWM lines is determined - staging: greybus: pwm: Make use of devm_pwmchip_alloc() function The greybus patches already got an Ack by Greg Kroah-Hartman in an earlier series, but I dropped it as the patches changed considerably. For the patches that already have an Ack by the respective maintainers I'll assume this is good enough to merge the patches via the pwm tree. Please object if you don't agree. For the others an Ack with that semantic would be nice. If you want to merge via your tree, that would need some coordination. The adaptions depend on patches #1 - #3, so this would involve an immutable branch or waiting until these patches reached your tree via the mainline tree. The series rebases fine on today's next, so at least for now there are no conflicts that git cannot resolve automatically. The biggest changes compared to v5 are: - Make pwmchip_parent's parameter const - Use pwmchip_parent also in drivers/pwm/sysfs.c and drivers/pwm/core.c - Several bug fixes in the conversions I found during the rework - Provide a non-devm pwmchip_alloc() function earlier (for the greybus pwm driver) - Increase alignment of driver private data to ARCH_DMA_MINALIGN bytes - Split several patches to make the easier reviewable The series is available via git at https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git pwm-lifetime-tracking if you want to give it a test. I'll keep this branch updated for the feedback I get here. Best regards Uwe Uwe Kleine-König (164): pwm: Provide an inline function to get the parent device of a given chip pwm: Provide wrappers for storing and getting driver private data pwm: Provide pwmchip_alloc() function and a devm variant of it pwm: ab8500: Make use of pwmchip_parent() accessor pwm: ab8500: Introduce a local pwm_chip variable in .probe() pwm: ab8500: Make use of devm_pwmchip_alloc() function pwm: apple: Make use of devm_pwmchip_alloc() function pwm: atmel: Change prototype of a helper to prepare further changes pwm: atmel: Make use of pwmchip_parent() accessor pwm: atmel: Make use of devm_pwmchip_alloc() function pwm: atmel-hlcdc: Prepare removing pwm_chip from driver data pwm: atmel-hlcdc: Make use of devm_pwmchip_alloc() function pwm: atmel-tcb: Make use of pwmchip_parent() accessor pwm: atmel-tcb: Prepare removing pwm_chip from driver data pwm: atmel-tcb: Make use of devm_pwmchip_alloc() function pwm: bcm2835: Make use of devm_pwmchip_alloc() function pwm: bcm-iproc: Make use of devm_pwmchip_alloc() function pwm: bcm-kona: Make use of pwmchip_parent() accessor pwm: bcm-kona: Make use of devm_pwmchip_alloc() function pwm: berlin: Prepare removing pwm_chip from driver data pwm: berlin: Make use of devm_pwmchip_alloc() function pwm: brcmstb: Make use of devm_pwmchip_alloc() function pwm: clk: Prepare removing pwm_chip from driver data pwm: clk: Make use of devm_pwmchip_alloc() function pwm: clps711x: Make use of devm_pwmchip_alloc() function pwm: crc: Simplify code to determine the pwmchip's parent device pwm: crc: Make use of pwmchip_parent() accessor pwm: crc: Make use of devm_pwmchip_alloc() function pwm: cros-ec: Change prototype of helpers to prepare further changes pwm: cros-ec: Make use of pwmchip_parent() accessor pwm: cros-ec: Make use of devm_pwmchip_alloc() function pwm: dwc: Prepare removing pwm_chip from driver data pwm: dwc: Make use of devm_pwmchip_alloc() function pwm: dwc-core: Make use of pwmchip_parent() accessor pwm: ep93xx: Make use of pwmchip_parent() accessor pwm: ep93xx: Make use of devm_pwmchip_alloc() function pwm: fsl-ftm: Change prototype of a helper to prepare further changes pwm: fsl-ftm: Make use of pwmchip_parent() accessor pwm: fsl-ftm: Prepare removing pwm_chip from driver data pwm: fsl-ftm: Make use of devm_pwmchip_alloc() function pwm: hibvt: Consistently name driver data hi_pwm_chip pwm: hibvt: Make use of devm_pwmchip_alloc() function pwm: img: Drop write-only variable from driver private data pwm: img: Make use of pwmchip_parent() accessor pwm: img: Prepare removing pwm_chip from driver data pwm: img: Make use of devm_pwmchip_alloc() function pwm: imx1: Make use of devm_pwmchip_alloc() function pwm: imx27: Make use of pwmchip_parent() accessor pwm: imx27: Make use of devm_pwmchip_alloc() function pwm: imx-tpm: Make use of devm_pwmchip_alloc() function pwm: intel-lgm: Make use of devm_pwmchip_alloc() function pwm: iqs620a: Create a wrapper for converting a pwm_chip to driver data pwm: iqs620a: Prepare removing pwm_chip from driver data pwm: iqs620a: Make use of devm_pwmchip_alloc() function pwm: jz4740: Change prototype of a helper to prepare further changes pwm: jz4740: Make use of pwmchip_parent() accessor pwm: jz4740: Make use of devm_pwmchip_alloc() function pwm: keembay: Make use of devm_pwmchip_alloc() function pwm: lp3943: Make use of devm_pwmchip_alloc() function pwm: lpc18xx-sct: Drop hardly used member from driver private data pwm: lpc18xx-sct: Make use of pwmchip_parent() accessor pwm: lpc18xx-sct: Prepare removing pwm_chip from driver data pwm: lpc18xx-sct: Make use of devm_pwmchip_alloc() function pwm: lpc32xx: Make use of devm_pwmchip_alloc() function pwm: lpss: Make use of pwmchip_parent() accessor pwm: lpss: Don't set driver data pwm: lpss-*: Make use of devm_pwmchip_alloc() function pwm: mediatek: Make use of pwmchip_parent() accessor pwm: mediatek: Make use of devm_pwmchip_alloc() function pwm: meson: Change prototype of a few helpers to prepare further changes pwm: meson: Make use of pwmchip_parent() accessor pwm: meson: Make use of devm_pwmchip_alloc() function pwm: microchip-core: Make use of devm_pwmchip_alloc() function pwm: mtk-disp: Make use of pwmchip_parent() accessor pwm: mtk-disp: Make use of devm_pwmchip_alloc() function pwm: mxs: Make use of devm_pwmchip_alloc() function pwm: ntxec: Make use of devm_pwmchip_alloc() function pwm: omap-dmtimer: Make use of pwmchip_parent() accessor pwm: omap-dmtimer: Prepare removing pwm_chip from driver data pwm: omap-dmtimer: Make use of devm_pwmchip_alloc() function pwm: pca9685: Prepare removing pwm_chip from driver data pwm: pca9685: Make use of pwmchip_parent() accessor pwm: pca9685: Make use of devm_pwmchip_alloc() function pwm: pxa: Make use of devm_pwmchip_alloc() function pwm: raspberrypi-poe: Make use of pwmchip_parent() accessor pwm: raspberrypi-poe: Make use of devm_pwmchip_alloc() function pwm: rcar: Make use of pwmchip_parent() accessor pwm: rcar: Prepare removing pwm_chip from driver data pwm: rcar: Make use of devm_pwmchip_alloc() function pwm: renesas-tpu: Make use of devm_pwmchip_alloc() function pwm: rochchip: Prepare removing pwm_chip from driver data pwm: rockchip: Make use of devm_pwmchip_alloc() function pwm: rz-mtu3: Make use of pwmchip_parent() accessor pwm: rz-mtu3: Prepare removing pwm_chip from driver data pwm: rz-mtu3: Make use of devm_pwmchip_alloc() function pwm: samsung: Simplify code to determine the pwmchip's parent device pwm: samsung: Change prototype of helpers to prepare further changes pwm: samsung: Make use of pwmchip_parent() accessor pwm: samsung: Simplify by using devm functions in probe pwm: samsung: Simplify using dev_err_probe() pwm: samsung: Make use of devm_pwmchip_alloc() function pwm: sifive: Simplify code to determine the pwmchip's parent device pwm: sifive: Prepare removing pwm_chip from driver data pwm: sifive: Make use of pwmchip_parent() accessor pwm: sifive: Make use of devm_pwmchip_alloc() function pwm: sl28cpld: Make use of devm_pwmchip_alloc() function pwm: spear: Make use of devm_pwmchip_alloc() function pwm: sprd: Rework how the available channels are counted pwm: sprd: Drop duplicated tracking of the parent device pwm: sprd: Make use of devm_pwmchip_alloc() function pwm: sti: Prepare removing pwm_chip from driver data pwm: sti: Make use of devm_pwmchip_alloc() function pwm: stm32: Simplify code to determine the pwmchip's parent device pwm: stm32: Change prototype of a helper to prepare further changes pwm: stm32: Prepare removing pwm_chip from driver data pwm: stm32: Change prototype of helper that detects npwm to prepare further changes pwm: stm32: Make use of devm_pwmchip_alloc() function pwm: stm32-lp: Simplify code to determine the pwmchip's parent device pwm: stm32-lp: Prepare removing pwm_chip from driver data pwm: stm32-lp: Make use of pwmchip_parent() accessor pwm: stm32-lp: Make use of devm_pwmchip_alloc() function pwm: stmpe: Make use of pwmchip_parent() accessor pwm: stmpe: Make use of devm_pwmchip_alloc() function pwm: sun4i: Make use of pwmchip_parent() accessor pwm: sun4i: Prepare removing pwm_chip from driver data pwm: sun4i: Consistently name driver data sun4ichip pwm: sun4i: Make use of devm_pwmchip_alloc() function pwm: sunplus: Make use of devm_pwmchip_alloc() function pwm: tegra: Drop duplicated tracking of the parent device pwm: tegra: Prepare removing pwm_chip from driver data pwm: tegra: Make use of devm_pwmchip_alloc() function pwm: tiecap: Simplify code to determine the pwmchip's parent device pwm: tiecap: Change prototype of helpers to prepare further changes pwm: tiecap: Make use of pwmchip_parent() accessor pwm: tiecap: Make use of devm_pwmchip_alloc() function pwm: tiehrpwm: Simplify code to determine the pwmchip's parent device pwm: tiehrpwm: Change prototype of helpers to prepare further changes pwm: tiehrpwm: Make use of pwmchip_parent() accessor pwm: tiehrpwm: Make use of devm_pwmchip_alloc() function pwm: twl: Make use of pwmchip_parent() accessor pwm: twl: Make use of devm_pwmchip_alloc() function pwm: twl-led: Make use of pwmchip_parent() accessor pwm: twl-led: Make use of devm_pwmchip_alloc() function pwm: visconti: Make use of devm_pwmchip_alloc() function pwm: vt8500: Change prototype of a helper to prepare further changes pwm: vt8500: Introduce a local pwm_chip variable in .probe() pwm: vt8500: Make use of pwmchip_parent() accessor pwm: vt8500: Make use of devm_pwmchip_alloc() function pwm: xilinx: Prepare removing pwm_chip from driver data pwm: xilinx: Make use of devm_pwmchip_alloc() function gpio: mvebu: Make use of devm_pwmchip_alloc() function drm/bridge: ti-sn65dsi86: Make use of pwmchip_parent() accessor drm/bridge: ti-sn65dsi86: Make use of devm_pwmchip_alloc() function leds: qcom-lpg: Make use of devm_pwmchip_alloc() function staging: greybus: pwm: Change prototype of helpers to prepare further changes staging: greybus: pwm: Make use of pwmchip_parent() accessor staging: greybus: pwm: Rely on pwm framework to pass a valid hwpwm staging: greybus: pwm: Drop unused gb_connection_set_data() staging: greybus: pwm: Rework how the number of PWM lines is determined staging: greybus: pwm: Make use of devm_pwmchip_alloc() function pwm: Ensure that pwm_chips are allocated using pwmchip_alloc() pwm: Ensure a struct pwm has the same lifetime as its pwm_chip pwm: Ensure the memory backing a PWM chip isn't freed while used pwm: Make pwmchip_[sg]et_drvdata() a wrapper around dev_set_drvdata() .../driver-api/driver-model/devres.rst | 1 + Documentation/driver-api/pwm.rst | 11 +- drivers/gpio/gpio-mvebu.c | 18 +- drivers/gpu/drm/bridge/ti-sn65dsi86.c | 31 +-- drivers/leds/rgb/leds-qcom-lpg.c | 16 +- drivers/pinctrl/intel/pinctrl-intel.c | 6 +- drivers/pwm/Kconfig | 4 - drivers/pwm/Makefile | 3 +- drivers/pwm/core.c | 184 +++++++++++++----- drivers/pwm/pwm-ab8500.c | 36 ++-- drivers/pwm/pwm-apple.c | 18 +- drivers/pwm/pwm-atmel-hlcdc.c | 37 ++-- drivers/pwm/pwm-atmel-tcb.c | 32 +-- drivers/pwm/pwm-atmel.c | 34 ++-- drivers/pwm/pwm-bcm-iproc.c | 19 +- drivers/pwm/pwm-bcm-kona.c | 23 ++- drivers/pwm/pwm-bcm2835.c | 19 +- drivers/pwm/pwm-berlin.c | 29 +-- drivers/pwm/pwm-brcmstb.c | 17 +- drivers/pwm/pwm-clk.c | 27 +-- drivers/pwm/pwm-clps711x.c | 17 +- drivers/pwm/pwm-crc.c | 22 +-- drivers/pwm/pwm-cros-ec.c | 58 +++--- drivers/pwm/pwm-dwc-core.c | 26 +-- drivers/pwm/pwm-dwc.c | 17 +- drivers/pwm/pwm-dwc.h | 9 +- drivers/pwm/pwm-ep93xx.c | 21 +- drivers/pwm/pwm-fsl-ftm.c | 49 ++--- drivers/pwm/pwm-hibvt.c | 70 ++++--- drivers/pwm/pwm-img.c | 60 +++--- drivers/pwm/pwm-imx-tpm.c | 34 ++-- drivers/pwm/pwm-imx1.c | 20 +- drivers/pwm/pwm-imx27.c | 26 +-- drivers/pwm/pwm-intel-lgm.c | 17 +- drivers/pwm/pwm-iqs620a.c | 30 +-- drivers/pwm/pwm-jz4740.c | 36 ++-- drivers/pwm/pwm-keembay.c | 17 +- drivers/pwm/pwm-lp3943.c | 17 +- drivers/pwm/pwm-lpc18xx-sct.c | 34 ++-- drivers/pwm/pwm-lpc32xx.c | 21 +- drivers/pwm/pwm-lpss-pci.c | 10 +- drivers/pwm/pwm-lpss-platform.c | 10 +- drivers/pwm/pwm-lpss.c | 34 ++-- drivers/pwm/pwm-lpss.h | 1 - drivers/pwm/pwm-mediatek.c | 29 +-- drivers/pwm/pwm-meson.c | 57 +++--- drivers/pwm/pwm-microchip-core.c | 17 +- drivers/pwm/pwm-mtk-disp.c | 25 ++- drivers/pwm/pwm-mxs.c | 32 +-- drivers/pwm/pwm-ntxec.c | 14 +- drivers/pwm/pwm-omap-dmtimer.c | 47 +++-- drivers/pwm/pwm-pca9685.c | 161 +++++++-------- drivers/pwm/pwm-pxa.c | 21 +- drivers/pwm/pwm-raspberrypi-poe.c | 20 +- drivers/pwm/pwm-rcar.c | 27 ++- drivers/pwm/pwm-renesas-tpu.c | 20 +- drivers/pwm/pwm-rockchip.c | 24 +-- drivers/pwm/pwm-rz-mtu3.c | 60 +++--- drivers/pwm/pwm-samsung.c | 94 ++++----- drivers/pwm/pwm-sifive.c | 30 +-- drivers/pwm/pwm-sl28cpld.c | 13 +- drivers/pwm/pwm-spear.c | 18 +- drivers/pwm/pwm-sprd.c | 58 +++--- drivers/pwm/pwm-sti.c | 61 +++--- drivers/pwm/pwm-stm32-lp.c | 31 ++- drivers/pwm/pwm-stm32.c | 56 +++--- drivers/pwm/pwm-stmpe.c | 58 +++--- drivers/pwm/pwm-sun4i.c | 100 +++++----- drivers/pwm/pwm-sunplus.c | 17 +- drivers/pwm/pwm-tegra.c | 50 ++--- drivers/pwm/pwm-tiecap.c | 55 +++--- drivers/pwm/pwm-tiehrpwm.c | 72 +++---- drivers/pwm/pwm-twl-led.c | 55 +++--- drivers/pwm/pwm-twl.c | 50 +++-- drivers/pwm/pwm-visconti.c | 17 +- drivers/pwm/pwm-vt8500.c | 43 ++-- drivers/pwm/pwm-xilinx.c | 34 ++-- drivers/pwm/sysfs.c | 45 +---- drivers/staging/greybus/pwm.c | 133 ++++++------- include/linux/platform_data/x86/pwm-lpss.h | 4 +- include/linux/pwm.h | 56 ++++-- 81 files changed, 1502 insertions(+), 1423 deletions(-) base-commit: ab105bfee27776dd946f8003d1e895fbf7674a3f -- 2.43.0

2 years, 4 months

← Newer
1
...
29
30
31
32
33
34
35
...
83
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

greybus-dev