diff options
| author | Colin Ian King <colin.king@canonical.com> | 2014-07-03 00:35:09 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-07-07 13:20:30 +0200 |
| commit | ed4b197ddd4d7aa6623e7777ea326c67c3a6b8ed (patch) | |
| tree | d714f53edff0112ae0e7f9a81cec30d502024aa6 /drivers/acpi/ec.c | |
| parent | dd43de20f540179863d9d7c3188b6a6cfde9a731 (diff) | |
| download | linux-ed4b197ddd4d7aa6623e7777ea326c67c3a6b8ed.tar.gz linux-ed4b197ddd4d7aa6623e7777ea326c67c3a6b8ed.tar.bz2 linux-ed4b197ddd4d7aa6623e7777ea326c67c3a6b8ed.zip | |
ACPI / EC: Free saved_ec on error exit path
Smatch detected two memory leaks on saved_ec:
drivers/acpi/ec.c:1070 acpi_ec_ecdt_probe() warn: possible
memory leak of 'saved_ec'
drivers/acpi/ec.c:1109 acpi_ec_ecdt_probe() warn: possible
memory leak of 'saved_ec'
Free saved_ec on these two error exit paths to stop the memory
leak. Note that saved_ec maybe null, but kfree on null is allowed.
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Lan Tianyu <tianyu.lan@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/ec.c')
| -rw-r--r-- | drivers/acpi/ec.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index ff16132e5c52..a66ab658abbc 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -1069,8 +1069,10 @@ int __init acpi_ec_ecdt_probe(void) /* fall through */ } - if (EC_FLAGS_SKIP_DSDT_SCAN) + if (EC_FLAGS_SKIP_DSDT_SCAN) { + kfree(saved_ec); return -ENODEV; + } /* This workaround is needed only on some broken machines, * which require early EC, but fail to provide ECDT */ @@ -1108,6 +1110,7 @@ install: } error: kfree(boot_ec); + kfree(saved_ec); boot_ec = NULL; return -ENODEV; } |