greybus-dev

greybus-dev@lists.linaro.org

2 participants
549 discussions

[PATCH AUTOSEL 4.19 518/671] staging: greybus: light: fix a couple double frees

by Sasha Levin

From: Dan Carpenter <dan.carpenter(a)oracle.com> [ Upstream commit 329101244f214952606359d254ae883b7109e1a5 ] The problem is in gb_lights_request_handler(). If we get a request to change the config then we release the light with gb_lights_light_release() and re-allocated it. However, if the allocation fails part way through then we call gb_lights_light_release() again. This can lead to a couple different double frees where we haven't cleared out the original values: gb_lights_light_v4l2_unregister(light); ... kfree(light->channels); kfree(light->name); I also made a small change to how we set "light->channels_count = 0;". The original code handled this part fine and did not cause a use after free but it was sort of complicated to read. Fixes: 2870b52bae4c ("greybus: lights: add lights implementation") Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> Acked-by: Rui Miguel Silva <rmfrfs(a)gmail.com> Link: https://lore.kernel.org/r/20190829122839.GA20116@mwanda Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- drivers/staging/greybus/light.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/greybus/light.c b/drivers/staging/greybus/light.c index 010ae1e9c7fb..40680eaf3974 100644 --- a/drivers/staging/greybus/light.c +++ b/drivers/staging/greybus/light.c @@ -1098,21 +1098,21 @@ static void gb_lights_channel_release(struct gb_channel *channel) static void gb_lights_light_release(struct gb_light *light) { int i; - int count; light->ready = false; - count = light->channels_count; - if (light->has_flash) gb_lights_light_v4l2_unregister(light); + light->has_flash = false; - for (i = 0; i < count; i++) { + for (i = 0; i < light->channels_count; i++) gb_lights_channel_release(&light->channels[i]); - light->channels_count--; - } + light->channels_count = 0; + kfree(light->channels); + light->channels = NULL; kfree(light->name); + light->name = NULL; } static void gb_lights_release(struct gb_lights *glights) -- 2.20.1

5 years, 1 month

Potential memory leak in greybus/svc.c

by Navid Emamdoost

Hello, It seems to me there is a memory leak in the implementation of gb_svc_create(). In the error handling path (labeled as err_put_device) the code correctly puts svc->dev, but I am suspicious that svc->wq is leaking. The allocated svc->wq needs a release via destroy_workqueue() in the error handling path. Am I missing something? Thank you, -- Navid.

5 years, 2 months

[PATCH] staging: greybus: add blank line after declarations

by Gabriela Bittencourt

Fix CHECK: add blank line after declarations Signed-off-by: Gabriela Bittencourt <gabrielabittencourt00(a)gmail.com> --- drivers/staging/greybus/control.h | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/staging/greybus/control.h b/drivers/staging/greybus/control.h index 3a29ec05f631..5a45d55349a1 100644 --- a/drivers/staging/greybus/control.h +++ b/drivers/staging/greybus/control.h @@ -24,6 +24,7 @@ struct gb_control { char *vendor_string; char *product_string; }; + #define to_gb_control(d) container_of(d, struct gb_control, dev) struct gb_control *gb_control_create(struct gb_interface *intf); -- 2.20.1

5 years, 4 months

[PATCH] greybus: remove excessive check in gb_connection_hd_cport_quiesce()

by Denis Efremov

Function pointer "hd->driver->cport_quiesce" is already checked at the beginning of gb_connection_hd_cport_quiesce(). Thus, the second check can be removed. Signed-off-by: Denis Efremov <efremov(a)linux.com> --- drivers/greybus/connection.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/greybus/connection.c b/drivers/greybus/connection.c index fc8f57f97ce6..e3799a53a193 100644 --- a/drivers/greybus/connection.c +++ b/drivers/greybus/connection.c @@ -361,9 +361,6 @@ static int gb_connection_hd_cport_quiesce(struct gb_connection *connection) if (connection->mode_switch) peer_space += sizeof(struct gb_operation_msg_hdr); - if (!hd->driver->cport_quiesce) - return 0; - ret = hd->driver->cport_quiesce(hd, connection->hd_cport_id, peer_space, GB_CONNECTION_CPORT_QUIESCE_TIMEOUT); -- 2.21.0

5 years, 5 months

[PATCH v2] staging: greybus: loopback_test: Adding missing brackets into if..else block

by Julio Faracco

Inside a block of if..else conditional, else structure does not contain brackets. This is not following regular policies of kernel coding style. All parts of this conditional blocks should respect brackets inclusion. This commit removes some blank spaces that are not following brackets policies too. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- Changes from v1: - fixing patch description - including more cases that brackets does not fill kernel code policies. --- --- drivers/staging/greybus/tools/loopback_test.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/drivers/staging/greybus/tools/loopback_test.c b/drivers/staging/greybus/tools/loopback_test.c index ba6f905f2..22e79f197 100644 --- a/drivers/staging/greybus/tools/loopback_test.c +++ b/drivers/staging/greybus/tools/loopback_test.c @@ -238,7 +238,6 @@ static void show_loopback_devices(struct loopback_test *t) for (i = 0; i < t->device_count; i++) printf("device[%d] = %s\n", i, t->devices[i].name); - } int open_sysfs(const char *sys_pfx, const char *node, int flags) @@ -273,7 +272,6 @@ float read_sysfs_float_fd(int fd, const char *sys_pfx, const char *node) char buf[SYSFS_MAX_INT]; if (read(fd, buf, sizeof(buf)) < 0) { - fprintf(stderr, "unable to read from %s%s %s\n", sys_pfx, node, strerror(errno)); close(fd); @@ -366,7 +364,6 @@ static int get_results(struct loopback_test *t) r->apbridge_unipro_latency_max - r->apbridge_unipro_latency_min; r->gbphy_firmware_latency_jitter = r->gbphy_firmware_latency_max - r->gbphy_firmware_latency_min; - } /*calculate the aggregate results of all enabled devices */ @@ -406,7 +403,6 @@ static int get_results(struct loopback_test *t) r->apbridge_unipro_latency_max - r->apbridge_unipro_latency_min; r->gbphy_firmware_latency_jitter = r->gbphy_firmware_latency_max - r->gbphy_firmware_latency_min; - } return 0; @@ -535,8 +531,8 @@ static int log_results(struct loopback_test *t) fprintf(stderr, "unable to open %s for appendation\n", file_name); abort(); } - } + for (i = 0; i < t->device_count; i++) { if (!device_enabled(t, i)) continue; @@ -549,10 +545,8 @@ static int log_results(struct loopback_test *t) if (ret == -1) fprintf(stderr, "unable to write %d bytes to csv.\n", len); } - } - if (t->aggregate_output) { len = format_output(t, &t->aggregate_results, "aggregate", data, sizeof(data), &tm); @@ -739,7 +733,6 @@ static int wait_for_complete(struct loopback_test *t) ts = &t->poll_timeout; while (1) { - ret = ppoll(t->fds, t->poll_count, ts, &mask_old); if (ret <= 0) { stop_tests(t); @@ -801,8 +794,9 @@ static void prepare_devices(struct loopback_test *t) write_sysfs_val(t->devices[i].sysfs_entry, "outstanding_operations_max", t->async_outstanding_operations); - } else + } else { write_sysfs_val(t->devices[i].sysfs_entry, "async", 0); + } } } @@ -879,10 +873,8 @@ static int sanity_check(struct loopback_test *t) fprintf(stderr, "Bad device mask %x\n", (1 << i)); return -1; } - } - return 0; } -- 2.20.1

5 years, 5 months

[PATCH] staging: greybus: loopback_test: remove multiple blank lines

by Pedro Chinen

Fix following checkpath warnings in multiple lines: CHECK: Please don't use multiple blank lines Signed-off-by: Pedro Chinen <ph.u.chinen(a)gmail.com> --- drivers/staging/greybus/tools/loopback_test.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/staging/greybus/tools/loopback_test.c b/drivers/staging/greybus/tools/loopback_test.c index ba6f905f26fa..1e78c148d7cb 100644 --- a/drivers/staging/greybus/tools/loopback_test.c +++ b/drivers/staging/greybus/tools/loopback_test.c @@ -779,7 +779,6 @@ static void prepare_devices(struct loopback_test *t) if (t->stop_all || device_enabled(t, i)) write_sysfs_val(t->devices[i].sysfs_entry, "type", 0); - for (i = 0; i < t->device_count; i++) { if (!device_enabled(t, i)) continue; @@ -850,7 +849,6 @@ void loopback_run(struct loopback_test *t) if (ret) goto err; - get_results(t); log_results(t); @@ -882,7 +880,6 @@ static int sanity_check(struct loopback_test *t) } - return 0; } -- 2.20.1

5 years, 5 months

[PATCH] staging: greybus: Adding missing brackets into if..else block.

by Julio Faracco

Inside a block of if..else conditional, else structure does not contain brackets. This is not following regular policies of good coding style. All parts of this conditional blocks should respect brackets inclusion. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- drivers/staging/greybus/tools/loopback_test.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/greybus/tools/loopback_test.c b/drivers/staging/greybus/tools/loopback_test.c index ba6f905f2..d46721502 100644 --- a/drivers/staging/greybus/tools/loopback_test.c +++ b/drivers/staging/greybus/tools/loopback_test.c @@ -801,8 +801,9 @@ static void prepare_devices(struct loopback_test *t) write_sysfs_val(t->devices[i].sysfs_entry, "outstanding_operations_max", t->async_outstanding_operations); - } else + } else { write_sysfs_val(t->devices[i].sysfs_entry, "async", 0); + } } } -- 2.20.1

5 years, 5 months

[PATCH] staging: greybus: remove blank line after an open brace '{'.

by joahannes

Fix checkpatch error "CHECK: Blank lines aren't necessary after an open brace '{'" in loopback_test.c:742. Signed-off-by: joahannes <joahannes(a)gmail.com> --- drivers/staging/greybus/tools/loopback_test.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/staging/greybus/tools/loopback_test.c b/drivers/staging/greybus/tools/loopback_test.c index ba6f905f2..251b05710 100644 --- a/drivers/staging/greybus/tools/loopback_test.c +++ b/drivers/staging/greybus/tools/loopback_test.c @@ -739,7 +739,6 @@ static int wait_for_complete(struct loopback_test *t) ts = &t->poll_timeout; while (1) { - ret = ppoll(t->fds, t->poll_count, ts, &mask_old); if (ret <= 0) { stop_tests(t); -- 2.20.1

5 years, 5 months

[PATCH 0/9] staging: move greybus core out of staging

by Greg Kroah-Hartman

The Greybus code has long been "stable" but was living in the drivers/staging/ directory to see if there really was going to be devices using this protocol over the long-term. With the success of millions of phones with this hardware and code in it, and the recent Google Summer of Code project, and a number of of new devices in the works from various companies, it is time to finally move this code out of staging into the "real" portion of the kernel so that people know they can rely on it. This series first does a little bit of checkpatch cleanups for some basic remaining issues in the greybus files, and then moves the include directory, the greybus core code, and the es2 greybus host controller driver into drivers/greybus. To come after this is the movement of the Documentation entries and a number of the module drivers that are stable. Greg Kroah-Hartman (9): staging: greybus: fix up SPDX comment in .h files staging: greybus: remove license "boilerplate" staging: greybus: hd: Fix up some alignment checkpatch issues staging: greybus: manifest: Fix up some alignment checkpatch issues staging: greybus: log: Fix up some alignment checkpatch issues staging: greybus: loopback: Fix up some alignment checkpatch issues staging: greybus: move core include files to include/linux/greybus/ staging: greybus: move the greybus core to drivers/greybus staging: greybus: move es2 to drivers/greybus/ MAINTAINERS | 3 + drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/greybus/Kconfig | 32 +++++ drivers/greybus/Makefile | 26 +++++ drivers/greybus/arpc.h | 63 ++++++++++ drivers/{staging => }/greybus/bundle.c | 2 +- drivers/{staging => }/greybus/connection.c | 2 +- drivers/{staging => }/greybus/control.c | 2 +- drivers/{staging => }/greybus/core.c | 2 +- drivers/{staging => }/greybus/debugfs.c | 3 +- drivers/{staging => }/greybus/es2.c | 3 +- drivers/{staging => }/greybus/greybus_trace.h | 2 +- drivers/{staging => }/greybus/hd.c | 12 +- drivers/{staging => }/greybus/interface.c | 2 +- drivers/{staging => }/greybus/manifest.c | 41 ++++--- drivers/{staging => }/greybus/module.c | 2 +- drivers/{staging => }/greybus/operation.c | 2 +- drivers/{staging => }/greybus/svc.c | 3 +- drivers/{staging => }/greybus/svc_watchdog.c | 2 +- .../Documentation/firmware/authenticate.c | 46 -------- .../greybus/Documentation/firmware/firmware.c | 46 -------- drivers/staging/greybus/Kconfig | 27 ----- drivers/staging/greybus/Makefile | 22 ---- drivers/staging/greybus/arche-platform.c | 2 +- drivers/staging/greybus/arpc.h | 109 ------------------ drivers/staging/greybus/audio_apbridgea.c | 3 +- drivers/staging/greybus/audio_apbridgea.h | 26 +---- drivers/staging/greybus/audio_codec.h | 4 +- drivers/staging/greybus/audio_gb.c | 4 +- drivers/staging/greybus/authentication.c | 3 +- drivers/staging/greybus/bootrom.c | 2 +- drivers/staging/greybus/camera.c | 2 +- drivers/staging/greybus/firmware.h | 4 +- drivers/staging/greybus/fw-core.c | 2 +- drivers/staging/greybus/fw-download.c | 2 +- drivers/staging/greybus/fw-management.c | 2 +- drivers/staging/greybus/gb-camera.h | 2 +- drivers/staging/greybus/gbphy.c | 2 +- drivers/staging/greybus/gbphy.h | 2 +- drivers/staging/greybus/gpio.c | 2 +- .../staging/greybus/greybus_authentication.h | 48 +------- drivers/staging/greybus/greybus_firmware.h | 48 +------- drivers/staging/greybus/hid.c | 3 +- drivers/staging/greybus/i2c.c | 2 +- drivers/staging/greybus/light.c | 4 +- drivers/staging/greybus/log.c | 9 +- drivers/staging/greybus/loopback.c | 9 +- drivers/staging/greybus/power_supply.c | 3 +- drivers/staging/greybus/pwm.c | 2 +- drivers/staging/greybus/raw.c | 3 +- drivers/staging/greybus/sdio.c | 2 +- drivers/staging/greybus/spi.c | 2 +- drivers/staging/greybus/spilib.c | 2 +- drivers/staging/greybus/spilib.h | 2 +- drivers/staging/greybus/tools/loopback_test.c | 2 - drivers/staging/greybus/uart.c | 2 +- drivers/staging/greybus/usb.c | 2 +- drivers/staging/greybus/vibrator.c | 3 +- .../greybus => include/linux}/greybus.h | 26 ++--- .../linux}/greybus/bundle.h | 0 .../linux}/greybus/connection.h | 0 .../linux}/greybus/control.h | 0 .../linux}/greybus/greybus_id.h | 0 .../linux}/greybus/greybus_manifest.h | 2 +- .../linux}/greybus/greybus_protocols.h | 48 +------- .../staging => include/linux}/greybus/hd.h | 2 +- .../linux}/greybus/interface.h | 2 +- .../linux}/greybus/manifest.h | 2 +- .../linux}/greybus/module.h | 2 +- .../linux}/greybus/operation.h | 2 +- .../staging => include/linux}/greybus/svc.h | 2 +- 72 files changed, 225 insertions(+), 532 deletions(-) create mode 100644 drivers/greybus/Kconfig create mode 100644 drivers/greybus/Makefile create mode 100644 drivers/greybus/arpc.h rename drivers/{staging => }/greybus/bundle.c (99%) rename drivers/{staging => }/greybus/connection.c (99%) rename drivers/{staging => }/greybus/control.c (99%) rename drivers/{staging => }/greybus/core.c (99%) rename drivers/{staging => }/greybus/debugfs.c (94%) rename drivers/{staging => }/greybus/es2.c (99%) rename drivers/{staging => }/greybus/greybus_trace.h (99%) rename drivers/{staging => }/greybus/hd.c (96%) rename drivers/{staging => }/greybus/interface.c (99%) rename drivers/{staging => }/greybus/manifest.c (95%) rename drivers/{staging => }/greybus/module.c (99%) rename drivers/{staging => }/greybus/operation.c (99%) rename drivers/{staging => }/greybus/svc.c (99%) rename drivers/{staging => }/greybus/svc_watchdog.c (99%) delete mode 100644 drivers/staging/greybus/arpc.h rename {drivers/staging/greybus => include/linux}/greybus.h (88%) rename {drivers/staging => include/linux}/greybus/bundle.h (100%) rename {drivers/staging => include/linux}/greybus/connection.h (100%) rename {drivers/staging => include/linux}/greybus/control.h (100%) rename {drivers/staging => include/linux}/greybus/greybus_id.h (100%) rename {drivers/staging => include/linux}/greybus/greybus_manifest.h (99%) rename {drivers/staging => include/linux}/greybus/greybus_protocols.h (96%) rename {drivers/staging => include/linux}/greybus/hd.h (98%) rename {drivers/staging => include/linux}/greybus/interface.h (98%) rename {drivers/staging => include/linux}/greybus/manifest.h (87%) rename {drivers/staging => include/linux}/greybus/module.h (94%) rename {drivers/staging => include/linux}/greybus/operation.h (99%) rename {drivers/staging => include/linux}/greybus/svc.h (98%) -- 2.23.0

5 years, 5 months

[PATCH] staging: greybus: light: fix a couple double frees

by Dan Carpenter

The problem is in gb_lights_request_handler(). If we get a request to change the config then we release the light with gb_lights_light_release() and re-allocated it. However, if the allocation fails part way through then we call gb_lights_light_release() again. This can lead to a couple different double frees where we haven't cleared out the original values: gb_lights_light_v4l2_unregister(light); ... kfree(light->channels); kfree(light->name); I also made a small change to how we set "light->channels_count = 0;". The original code handled this part fine and did not cause a use after free but it was sort of complicated to read. Fixes: 2870b52bae4c ("greybus: lights: add lights implementation") Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> --- drivers/staging/greybus/light.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/greybus/light.c b/drivers/staging/greybus/light.c index 010ae1e9c7fb..40680eaf3974 100644 --- a/drivers/staging/greybus/light.c +++ b/drivers/staging/greybus/light.c @@ -1098,21 +1098,21 @@ static void gb_lights_channel_release(struct gb_channel *channel) static void gb_lights_light_release(struct gb_light *light) { int i; - int count; light->ready = false; - count = light->channels_count; - if (light->has_flash) gb_lights_light_v4l2_unregister(light); + light->has_flash = false; - for (i = 0; i < count; i++) { + for (i = 0; i < light->channels_count; i++) gb_lights_channel_release(&light->channels[i]); - light->channels_count--; - } + light->channels_count = 0; + kfree(light->channels); + light->channels = NULL; kfree(light->name); + light->name = NULL; } static void gb_lights_release(struct gb_lights *glights) -- 2.20.1

5 years, 5 months

← Newer
1
...
35
36
37
38
39
40
41
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

greybus-dev