android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform/x86/dell/dell-rbtn: Fix resources leaking on error path

Browse Source 
[ Upstream commit 966cca72ab20289083521a385fa56035d85a222d ]

Currently rbtn_add() in case of failure is leaking resources. Fix this
by adding a proper rollback. Move devm_kzalloc() before rbtn_acquire(),
so it doesn't require rollback in case of failure. While at it, remove
unnecessary assignment of NULL to device->driver_data and unnecessary
whitespace, plus add a break for the default case in a switch.

Suggested-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Suggested-by: Pali Rohár <pali@kernel.org>
Fixes: 817a5cdb40 ("dell-rbtn: Dell Airplane Mode Switch driver")
Signed-off-by: Michal Wilczynski <michal.wilczynski@intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Rafael J. Wysocki <rafael@kernel.org>
Reviewed-by: Pali Rohár <pali@kernel.org>
Link: https://lore.kernel.org/r/20230613084310.2775896-1-michal.wilczynski@intel.com
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Michal Wilczynski 2023-06-13 11:43:10 +03:00 committed by Greg Kroah-Hartman
parent 9999a9f004
commit c94376dbd6
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/platform/x86/dell/dell-rbtn.c
View File

@ -395,16 +395,16 @@ static int rbtn_add(struct acpi_device *device)
return -EINVAL; return -EINVAL;
} }
rbtn_data = devm_kzalloc(&device->dev, sizeof(*rbtn_data), GFP_KERNEL);
if (!rbtn_data)
return -ENOMEM;
ret = rbtn_acquire(device, true); ret = rbtn_acquire(device, true);
if (ret < 0) { if (ret < 0) {
dev_err(&device->dev, "Cannot enable device\n"); dev_err(&device->dev, "Cannot enable device\n");
return ret; return ret;
} }
rbtn_data = devm_kzalloc(&device->dev, sizeof(*rbtn_data), GFP_KERNEL);
if (!rbtn_data)
return -ENOMEM;
rbtn_data->type = type; rbtn_data->type = type;
device->driver_data = rbtn_data; device->driver_data = rbtn_data;
@ -420,10 +420,12 @@ static int rbtn_add(struct acpi_device *device)
break; break;
default: default:
ret = -EINVAL; ret = -EINVAL;
break;
} }
if (ret)
rbtn_acquire(device, false);
return ret; return ret;
} }
static int rbtn_remove(struct acpi_device *device) static int rbtn_remove(struct acpi_device *device)
@ -442,7 +444,6 @@ static int rbtn_remove(struct acpi_device *device)
} }
rbtn_acquire(device, false); rbtn_acquire(device, false);
device->driver_data = NULL;
return 0; return 0;
} }