Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1c31bcd authored by Andy Lutomirski's avatar Andy Lutomirski Committed by Darren Hart (VMware)
Browse files

platform/x86: wmi: Fix error handling when creating devices 



We have two memory leaks. If guid_already_parsed returned true, we leak
the wmi_block. If wmi_create_device failed, we leak the device.

Simplify the logic and fix both of them.

Signed-off-by: default avatarAndy Lutomirski <luto@kernel.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Mario Limonciello <mario_limonciello@dell.com>
Cc: Pali Rohár <pali.rohar@gmail.com>
Cc: linux-kernel@vger.kernel.org
Cc: platform-driver-x86@vger.kernel.org
Cc: linux-acpi@vger.kernel.org
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarDarren Hart (VMware) <dvhart@infradead.org>
parent 844af950

drivers/platform/x86/wmi.c

+15 −13
Original line number Diff line number Diff line
@@ -757,6 +757,15 @@ static int parse_wdg(struct device *wmi_bus_dev, struct acpi_device *device) 
		if (debug_dump_wdg)

			wmi_dump_wdg(&gblock[i]);



		/*

		 * Some WMI devices, like those for nVidia hooks, have a

		 * duplicate GUID. It's not clear what we should do in this

		 * case yet, so for now, we'll just ignore the duplicate

		 * for device creation.

		 */

		if (guid_already_parsed(device, gblock[i].guid))

			continue;



		wblock = kzalloc(sizeof(struct wmi_block), GFP_KERNEL);

		if (!wblock)

			return -ENOMEM;
@@ -764,20 +773,13 @@ static int parse_wdg(struct device *wmi_bus_dev, struct acpi_device *device) 
		wblock->acpi_device = device;

		wblock->gblock = gblock[i];



		/*

		  Some WMI devices, like those for nVidia hooks, have a

		  duplicate GUID. It's not clear what we should do in this

		  case yet, so for now, we'll just ignore the duplicate

		  for device creation.

		*/

		if (!guid_already_parsed(device, gblock[i].guid)) {

		retval = wmi_create_device(wmi_bus_dev, &gblock[i],

					   wblock, device);

		if (retval) {

			put_device(&wblock->dev.dev);

			wmi_free_devices(device);

			goto out_free_pointer;

		}

		}



		list_add_tail(&wblock->list, &wmi_block_list);