linux-kernel - Re: [PATCH 1/1] ACPI: property: Fix error handling in acpi_init

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAJZ5v0jS9M8N_dHMnL2vW9g844_0Z4crzRdQFOgjcPYu4-7uLw@mail.gmail.com>
Date:   Tue, 9 Aug 2022 19:22:02 +0200
From:   "Rafael J. Wysocki" <rafael@...nel.org>
To:     Sakari Ailus <sakari.ailus@...ux.intel.com>
Cc:     "Rafael J. Wysocki" <rafael.j.wysocki@...el.com>,
        LKML <linux-kernel@...r.kernel.org>,
        Linux Memory Management List <linux-mm@...ck.org>,
        ACPI Devel Maling List <linux-acpi@...r.kernel.org>,
        lkp@...ts.01.org, kbuild test robot <lkp@...el.com>,
        kernel test robot <oliver.sang@...el.com>
Subject: Re: [PATCH 1/1] ACPI: property: Fix error handling in acpi_init_properties()

On Mon, Aug 8, 2022 at 11:12 PM Sakari Ailus
<sakari.ailus@...ux.intel.com> wrote:
>
> buf.pointer, memory for storing _DSD data and nodes, was released if either
> parsing properties or, as recently added, attaching data node tags failed.
> Alas, properties were still left pointing to this memory if parsing
> properties were successful but attaching data node tags failed.
>
> Fix this by separating error handling for the two, and leaving properties
> intact if data nodes cannot be tagged for a reason or another.
>
> Reported-by: kernel test robot <oliver.sang@...el.com>
> Fixes: 1d52f10917a7 ("ACPI: property: Tie data nodes to acpi handles")
> Signed-off-by: Sakari Ailus <sakari.ailus@...ux.intel.com>
> ---
> Hi Rafael,
>
> This should fix the immediate problem. It needs to be figured out why data
> node tagging doesn't work sometimes but that can wait.

Applied, but ->

>  drivers/acpi/property.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c
> index 9711482014a6..201a5a9b2671 100644
> --- a/drivers/acpi/property.c
> +++ b/drivers/acpi/property.c
> @@ -566,13 +566,13 @@ void acpi_init_properties(struct acpi_device *adev)
>                                         &adev->data, acpi_fwnode_handle(adev)))
>                 adev->data.pointer = buf.pointer;
>
> -       if (!adev->data.pointer ||
> -           !acpi_tie_nondev_subnodes(&adev->data)) {
> -               acpi_untie_nondev_subnodes(&adev->data);
> +       if (!adev->data.pointer) {
>                 acpi_handle_debug(adev->handle, "Invalid _DSD data, skipping\n");
>                 ACPI_FREE(buf.pointer);
> +       } else {
> +               if (!acpi_tie_nondev_subnodes(&adev->data))
> +                       acpi_untie_nondev_subnodes(&adev->data);
>         }
> -

-> dropped this empty line removal which is unrelated to the fix (and
the empty line is there on purpose).

>   out:
>         if (acpi_of && !adev->flags.of_compatible_ok)
>                 acpi_handle_info(adev->handle,
> --

Please note that I will not be able to push things after Thursday this
week and throughout the next week, so either this goes in on Thursday
or it will miss 5.20, in which case sorry about that.  We'll see.

Thanks!