mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 22:26:55 +00:00
platform/x86/dell/dell-rbtn: Fix resources leaking on error path
[ Upstream commit966cca72ab
] 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:
parent
9999a9f004
commit
c94376dbd6
1 changed files with 7 additions and 6 deletions
|
@ -395,16 +395,16 @@ static int rbtn_add(struct acpi_device *device)
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
rbtn_data = devm_kzalloc(&device->dev, sizeof(*rbtn_data), GFP_KERNEL);
|
||||
if (!rbtn_data)
|
||||
return -ENOMEM;
|
||||
|
||||
ret = rbtn_acquire(device, true);
|
||||
if (ret < 0) {
|
||||
dev_err(&device->dev, "Cannot enable device\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
rbtn_data = devm_kzalloc(&device->dev, sizeof(*rbtn_data), GFP_KERNEL);
|
||||
if (!rbtn_data)
|
||||
return -ENOMEM;
|
||||
|
||||
rbtn_data->type = type;
|
||||
device->driver_data = rbtn_data;
|
||||
|
||||
|
@ -420,10 +420,12 @@ static int rbtn_add(struct acpi_device *device)
|
|||
break;
|
||||
default:
|
||||
ret = -EINVAL;
|
||||
break;
|
||||
}
|
||||
if (ret)
|
||||
rbtn_acquire(device, false);
|
||||
|
||||
return ret;
|
||||
|
||||
}
|
||||
|
||||
static int rbtn_remove(struct acpi_device *device)
|
||||
|
@ -442,7 +444,6 @@ static int rbtn_remove(struct acpi_device *device)
|
|||
}
|
||||
|
||||
rbtn_acquire(device, false);
|
||||
device->driver_data = NULL;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue