Content-Type: multipart/mixed; boundary="===============8199259928226972341==" MIME-Version: 1.0 From: Andy Shevchenko Subject: [Devel] [PATCH v1 1/1] ACPI: utils: Fix reference counting in for_each_acpi_dev_match() Date: Thu, 20 May 2021 00:02:53 +0300 Message-ID: <20210519210253.3578025-1-andy.shevchenko@gmail.com> List-ID: To: devel@acpica.org --===============8199259928226972341== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Currently it's possible to iterate over the dangling pointer in case the de= vice suddenly disappears. This may happen becase callers put it at the end of a = loop. Instead, let's move that call inside acpi_dev_get_next_match_dev(). Fixes: 803abec64ef9 ("media: ipu3-cio2: Add cio2-bridge to ipu3-cio2 driver= ") Fixes: bf263f64e804 ("media: ACPI / bus: Add acpi_dev_get_next_match_dev() = and helper macro") Cc: Daniel Scally Cc: Sakari Ailus Signed-off-by: Andy Shevchenko --- drivers/acpi/utils.c | 5 +---- drivers/media/pci/intel/ipu3/cio2-bridge.c | 8 +++----- include/acpi/acpi_bus.h | 5 ----- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c index 3b54b8fd7396..ccfc484dbffd 100644 --- a/drivers/acpi/utils.c +++ b/drivers/acpi/utils.c @@ -846,10 +846,6 @@ EXPORT_SYMBOL(acpi_dev_present); * Return the next match of ACPI device if another matching device was pre= sent * at the moment of invocation, or NULL otherwise. * - * FIXME: The function does not tolerate the sudden disappearance of @adev= , e.g. - * in the case of a hotplug event. That said, the caller should ensure that - * this will never happen. - * * The caller is responsible for invoking acpi_dev_put() on the returned d= evice. * * See additional information in acpi_dev_present() as well. @@ -866,6 +862,7 @@ acpi_dev_get_next_match_dev(struct acpi_device *adev, c= onst char *hid, const cha match.hrv =3D hrv; = dev =3D bus_find_device(&acpi_bus_type, start, &match, acpi_dev_match_cb); + acpi_dev_put(adev); return dev ? to_acpi_device(dev) : NULL; } EXPORT_SYMBOL(acpi_dev_get_next_match_dev); diff --git a/drivers/media/pci/intel/ipu3/cio2-bridge.c b/drivers/media/pci= /intel/ipu3/cio2-bridge.c index e8511787c1e4..477417261b6e 100644 --- a/drivers/media/pci/intel/ipu3/cio2-bridge.c +++ b/drivers/media/pci/intel/ipu3/cio2-bridge.c @@ -178,13 +178,11 @@ static int cio2_bridge_connect_sensor(const struct ci= o2_sensor_config *cfg, = if (bridge->n_sensors >=3D CIO2_NUM_PORTS) { dev_err(&cio2->dev, "Exceeded available CIO2 ports\n"); - cio2_bridge_unregister_sensors(bridge); ret =3D -EINVAL; - goto err_out; + goto err_put_adev; } = sensor =3D &bridge->sensors[bridge->n_sensors]; - sensor->adev =3D adev; strscpy(sensor->name, cfg->hid, sizeof(sensor->name)); = ret =3D cio2_bridge_read_acpi_buffer(adev, "SSDB", @@ -214,6 +212,7 @@ static int cio2_bridge_connect_sensor(const struct cio2= _sensor_config *cfg, goto err_free_swnodes; } = + sensor->adev =3D acpi_dev_get(adev); adev->fwnode.secondary =3D fwnode; = dev_info(&cio2->dev, "Found supported sensor %s\n", @@ -227,8 +226,7 @@ static int cio2_bridge_connect_sensor(const struct cio2= _sensor_config *cfg, err_free_swnodes: software_node_unregister_nodes(sensor->swnodes); err_put_adev: - acpi_dev_put(sensor->adev); -err_out: + acpi_dev_put(adev); return ret; } = diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 3a82faac5767..bff6a11bb21f 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -698,11 +698,6 @@ acpi_dev_get_first_match_dev(const char *hid, const ch= ar *uid, s64 hrv); * @hrv: Hardware Revision of the device, pass -1 to not check _HRV * * The caller is responsible for invoking acpi_dev_put() on the returned d= evice. - * - * FIXME: Due to above requirement there is a window that may invalidate @= adev - * and next iteration will use a dangling pointer, e.g. in the case of a - * hotplug event. That said, the caller should ensure that this will never - * happen. */ #define for_each_acpi_dev_match(adev, hid, uid, hrv) \ for (adev =3D acpi_dev_get_first_match_dev(hid, uid, hrv); \ -- = 2.31.1 --===============8199259928226972341==--