]> git.itanic.dy.fi Git - linux-stable/commitdiff
efi/esrt: Fix reference count leak in esre_create_sysfs_entry.
authorQiushi Wu <wu000273@umn.edu>
Thu, 28 May 2020 18:38:04 +0000 (13:38 -0500)
committerSasha Levin <sashal@kernel.org>
Tue, 30 Jun 2020 19:38:42 +0000 (15:38 -0400)
[ Upstream commit 4ddf4739be6e375116c375f0a68bf3893ffcee21 ]

kobject_init_and_add() takes reference even when it fails.
If this function returns an error, kobject_put() must be called to
properly clean up the memory associated with the object. Previous
commit "b8eb718348b8" fixed a similar problem.

Fixes: 0bb549052d33 ("efi: Add esrt support")
Signed-off-by: Qiushi Wu <wu000273@umn.edu>
Link: https://lore.kernel.org/r/20200528183804.4497-1-wu000273@umn.edu
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/firmware/efi/esrt.c

index 241dd7c63d2c8dcb231702952154bf1d45fab854..481b2f0a190b0b49741483fcadc1b6d0d14df338 100644 (file)
@@ -180,7 +180,7 @@ static int esre_create_sysfs_entry(void *esre, int entry_num)
                rc = kobject_init_and_add(&entry->kobj, &esre1_ktype, NULL,
                                          "entry%d", entry_num);
                if (rc) {
-                       kfree(entry);
+                       kobject_put(&entry->kobj);
                        return rc;
                }
        }