Message ID | 20231020084732.17130-6-raag.jadav@intel.com (mailing list archive) |
---|---|
State | Changes Requested, archived |
Headers | show |
Series | Refine _UID references across kernel | expand |
On Fri, Oct 20, 2023 at 02:17:29PM +0530, Raag Jadav wrote: > Convert manual _UID references to use standard ACPI helpers. Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> ... > - if (!adev->pnp.unique_id || > - strcmp(adev->pnp.unique_id, override_status_ids[i].uid)) > + if (!acpi_dev_uid_match(adev, override_status_ids[i].uid)) The check for NULL argument inside that API does not affect the behaviour as otherwise it will be a crash with the current implementation. > continue;
On Fri, Oct 20, 2023 at 12:38 PM Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > > On Fri, Oct 20, 2023 at 02:17:29PM +0530, Raag Jadav wrote: > > Convert manual _UID references to use standard ACPI helpers. > > Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > > ... > > > - if (!adev->pnp.unique_id || > > - strcmp(adev->pnp.unique_id, override_status_ids[i].uid)) > > + if (!acpi_dev_uid_match(adev, override_status_ids[i].uid)) > > The check for NULL argument inside that API does not affect the behaviour as > otherwise it will be a crash with the current implementation. What current implementation do you mean, exactly?
On Fri, Oct 20, 2023 at 07:05:37PM +0200, Rafael J. Wysocki wrote: > On Fri, Oct 20, 2023 at 12:38 PM Andy Shevchenko > <andriy.shevchenko@linux.intel.com> wrote: > > On Fri, Oct 20, 2023 at 02:17:29PM +0530, Raag Jadav wrote: ... > > > - if (!adev->pnp.unique_id || > > > - strcmp(adev->pnp.unique_id, override_status_ids[i].uid)) > > > + if (!acpi_dev_uid_match(adev, override_status_ids[i].uid)) > > > > The check for NULL argument inside that API does not affect the behaviour as > > otherwise it will be a crash with the current implementation. > > What current implementation do you mean, exactly? strcmp() against NULL will crash the system.
diff --git a/drivers/acpi/x86/utils.c b/drivers/acpi/x86/utils.c index 63d834dd3811..bc65ebfcdf76 100644 --- a/drivers/acpi/x86/utils.c +++ b/drivers/acpi/x86/utils.c @@ -184,8 +184,7 @@ bool acpi_device_override_status(struct acpi_device *adev, unsigned long long *s if (acpi_match_device_ids(adev, override_status_ids[i].hid)) continue; - if (!adev->pnp.unique_id || - strcmp(adev->pnp.unique_id, override_status_ids[i].uid)) + if (!acpi_dev_uid_match(adev, override_status_ids[i].uid)) continue; }
Convert manual _UID references to use standard ACPI helpers. Signed-off-by: Raag Jadav <raag.jadav@intel.com> --- drivers/acpi/x86/utils.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)