From: Johan Hovold <johan@xxxxxxxxxx>
commit 202c08914ba50dd324e42d5ad99535a89f242560 upstream.
Make sure to free the platform device also in the unlikely event that
registration fails.
Fixes: 0589e8889dce ("drivers/firmware: Add missing platform_device_put() in sysfb_create_simplefb")
Fixes: 8633ef82f101 ("drivers/firmware: consolidate EFI framebuffer setup for all arches")
Cc: stable@xxxxxxxxxxxxxxx # 5.14
Cc: Miaoqian Lin <linmq006@xxxxxxxxx>
Cc: Javier Martinez Canillas <javierm@xxxxxxxxxx>
Signed-off-by: Johan Hovold <johan@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20220303180519.3117-1-johan@xxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/firmware/sysfb_simplefb.c | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
--- a/drivers/firmware/sysfb_simplefb.c
+++ b/drivers/firmware/sysfb_simplefb.c
@@ -113,16 +113,21 @@ __init int sysfb_create_simplefb(const s
sysfb_apply_efi_quirks(pd);
ret = platform_device_add_resources(pd, &res, 1);
- if (ret) {
- platform_device_put(pd);
- return ret;
- }
+ if (ret)
+ goto err_put_device;
ret = platform_device_add_data(pd, mode, sizeof(*mode));
- if (ret) {
- platform_device_put(pd);
- return ret;
- }
+ if (ret)
+ goto err_put_device;
- return platform_device_add(pd);
+ ret = platform_device_add(pd);
+ if (ret)
+ goto err_put_device;
+
+ return 0;
+
+err_put_device:
+ platform_device_put(pd);
+
+ return ret;
}
Patches currently in stable-queue which might be from johan@xxxxxxxxxx are
queue-5.15/usb-serial-pl2303-add-ibm-device-ids.patch
queue-5.15/usb-serial-simple-add-nokia-phone-driver.patch
queue-5.15/firmware-sysfb-fix-platform-device-leak-in-error-path.patch
queue-5.15/greybus-svc-fix-an-error-handling-bug-in-gb_svc_hello.patch
queue-5.15/usb-serial-pl2303-fix-gs-type-detection.patch
