]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
driver core: location: Free struct acpi_pld_info *pld before return false
authorHanjun Guo <guohanjun@huawei.com>
Tue, 22 Nov 2022 07:37:28 +0000 (15:37 +0800)
committerAndrea Righi <andrea.righi@canonical.com>
Tue, 14 Mar 2023 15:46:55 +0000 (16:46 +0100)
BugLink: https://bugs.launchpad.net/bugs/2011425
[ Upstream commit 0d150f967e8410e1e6712484543eec709356a65d ]

struct acpi_pld_info *pld should be freed before the return of allocation
failure, to prevent memory leak, add the ACPI_FREE() to fix it.

Fixes: bc443c31def5 ("driver core: location: Check for allocations failure")
Signed-off-by: Hanjun Guo <guohanjun@huawei.com>
Link: https://lore.kernel.org/r/1669102648-11517-1-git-send-email-guohanjun@huawei.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
drivers/base/physical_location.c

index 87af641cfe1a3daad857eeec88ad98ad04b8df7b..951819e71b4ad43cffd24fb48caeb4d066d651aa 100644 (file)
@@ -24,8 +24,11 @@ bool dev_add_physical_location(struct device *dev)
 
        dev->physical_location =
                kzalloc(sizeof(*dev->physical_location), GFP_KERNEL);
-       if (!dev->physical_location)
+       if (!dev->physical_location) {
+               ACPI_FREE(pld);
                return false;
+       }
+
        dev->physical_location->panel = pld->panel;
        dev->physical_location->vertical_position = pld->vertical_position;
        dev->physical_location->horizontal_position = pld->horizontal_position;