[PATCH v2] ACPI: FPDT: Add the missed acpi_put_table() in acpi_init_fpdt()

[PATCH v2] ACPI: FPDT: Add the missed acpi_put_table() in acpi_init_fpdt()

[Jing Xiangfeng]

acpi_init_fpdt() misses to call acpi_put_table() in an error path. Add
the missed function call to fix it.

Fixes: d1eb86e59be0 ("ACPI: tables: introduce support for FPDT table")
Signed-off-by: Jing Xiangfeng <jingxiangfeng@huawei.com>
Acked-by: Zhang Rui <rui.zhang@intel.com>
---
v1 -> v2:
- Collect Acked-by tag by Zhang Rui.
- retitle the subject as suggested by Hanjun Guo.
---
 drivers/acpi/acpi_fpdt.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/acpi/acpi_fpdt.c b/drivers/acpi/acpi_fpdt.c
index a89a806a7a2a..4ee2ad234e3d 100644
--- a/drivers/acpi/acpi_fpdt.c
+++ b/drivers/acpi/acpi_fpdt.c
@@ -240,8 +240,10 @@ static int __init acpi_init_fpdt(void)
 		return 0;
 
 	fpdt_kobj = kobject_create_and_add("fpdt", acpi_kobj);
-	if (!fpdt_kobj)
+	if (!fpdt_kobj) {
+		acpi_put_table(header);
 		return -ENOMEM;
+	}
 
 	while (offset < header->length) {
 		subtable = (void *)header + offset;
-- 
2.26.0.106.g9fadedd

Re: [PATCH v2] ACPI: FPDT: Add the missed acpi_put_table() in acpi_init_fpdt()

[Hanjun Guo]

On 2021/6/2 19:58, Jing Xiangfeng wrote:
> acpi_init_fpdt() misses to call acpi_put_table() in an error path. Add
> the missed function call to fix it.
> 
> Fixes: d1eb86e59be0 ("ACPI: tables: introduce support for FPDT table")
> Signed-off-by: Jing Xiangfeng <jingxiangfeng@huawei.com>
> Acked-by: Zhang Rui <rui.zhang@intel.com>
> ---
> v1 -> v2:
> - Collect Acked-by tag by Zhang Rui.
> - retitle the subject as suggested by Hanjun Guo.
> ---
>   drivers/acpi/acpi_fpdt.c | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/acpi/acpi_fpdt.c b/drivers/acpi/acpi_fpdt.c
> index a89a806a7a2a..4ee2ad234e3d 100644
> --- a/drivers/acpi/acpi_fpdt.c
> +++ b/drivers/acpi/acpi_fpdt.c
> @@ -240,8 +240,10 @@ static int __init acpi_init_fpdt(void)
>   		return 0;
>   
>   	fpdt_kobj = kobject_create_and_add("fpdt", acpi_kobj);
> -	if (!fpdt_kobj)
> +	if (!fpdt_kobj) {
> +		acpi_put_table(header);
>   		return -ENOMEM;
> +	}
>   
>   	while (offset < header->length) {
>   		subtable = (void *)header + offset;

Reviewed-by: Hanjun Guo <guohanjun@huawei.com>

Re: [PATCH v2] ACPI: FPDT: Add the missed acpi_put_table() in acpi_init_fpdt()

[Rafael J. Wysocki]

On Wed, Jun 2, 2021 at 1:44 PM Jing Xiangfeng <jingxiangfeng@huawei.com> wrote:
>
> acpi_init_fpdt() misses to call acpi_put_table() in an error path. Add
> the missed function call to fix it.
>
> Fixes: d1eb86e59be0 ("ACPI: tables: introduce support for FPDT table")
> Signed-off-by: Jing Xiangfeng <jingxiangfeng@huawei.com>
> Acked-by: Zhang Rui <rui.zhang@intel.com>
> ---
> v1 -> v2:
> - Collect Acked-by tag by Zhang Rui.
> - retitle the subject as suggested by Hanjun Guo.
> ---
>  drivers/acpi/acpi_fpdt.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/acpi/acpi_fpdt.c b/drivers/acpi/acpi_fpdt.c
> index a89a806a7a2a..4ee2ad234e3d 100644
> --- a/drivers/acpi/acpi_fpdt.c
> +++ b/drivers/acpi/acpi_fpdt.c
> @@ -240,8 +240,10 @@ static int __init acpi_init_fpdt(void)
>                 return 0;
>
>         fpdt_kobj = kobject_create_and_add("fpdt", acpi_kobj);
> -       if (!fpdt_kobj)
> +       if (!fpdt_kobj) {
> +               acpi_put_table(header);
>                 return -ENOMEM;
> +       }
>
>         while (offset < header->length) {
>                 subtable = (void *)header + offset;
> --

Applied as 5.14 material with some edits in the subject and changelog, thanks!