| Message ID | 1404344109-30805-1-git-send-email-colin.king@canonical.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
2014-07-03 7:35 GMT+08:00 Colin King <colin.king@canonical.com>: > From: Colin Ian King <colin.king@canonical.com> > > 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. > Acked-by: Lan Tianyu <tianyu.lan@intel.com> > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > drivers/acpi/ec.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c > index ad11ba4..9800f50 100644 > --- a/drivers/acpi/ec.c > +++ b/drivers/acpi/ec.c > @@ -1066,8 +1066,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 */ > @@ -1105,6 +1107,7 @@ install: > } > error: > kfree(boot_ec); > + kfree(saved_ec); > boot_ec = NULL; > return -ENODEV; > } > -- > 2.0.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-acpi" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
On Friday, July 04, 2014 10:15:52 AM Lan Tianyu wrote: > 2014-07-03 7:35 GMT+08:00 Colin King <colin.king@canonical.com>: > > From: Colin Ian King <colin.king@canonical.com> > > > > 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. > > > > Acked-by: Lan Tianyu <tianyu.lan@intel.com> Queued up for 3.16, thanks! > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > > --- > > drivers/acpi/ec.c | 5 ++++- > > 1 file changed, 4 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c > > index ad11ba4..9800f50 100644 > > --- a/drivers/acpi/ec.c > > +++ b/drivers/acpi/ec.c > > @@ -1066,8 +1066,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 */ > > @@ -1105,6 +1107,7 @@ install: > > } > > error: > > kfree(boot_ec); > > + kfree(saved_ec); > > boot_ec = NULL; > > return -ENODEV; > > } > > -- > > 2.0.1 > > > > -- > > To unsubscribe from this list: send the line "unsubscribe linux-acpi" in > > the body of a message to majordomo@vger.kernel.org > > More majordomo info at http://vger.kernel.org/majordomo-info.html > > > >
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index ad11ba4..9800f50 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -1066,8 +1066,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 */ @@ -1105,6 +1107,7 @@ install: } error: kfree(boot_ec); + kfree(saved_ec); boot_ec = NULL; return -ENODEV; }