From: Colin Ian King <colin.king@canonical.com>
Date: Mon, 8 Apr 2019 09:00:44 +0000 (+0100)
Subject: tools/power turbostat: fix leak of file descriptor on error return path
X-Git-Tag: v5.2.17~29
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0a1ba2cd9d620ec815ca901ca19d6ffb36f3b551;p=users%2Fdwmw2%2Flinux.git

tools/power turbostat: fix leak of file descriptor on error return path

[ Upstream commit 15423b958f33132152e209e98df0dedc7a78f22c ]

Currently the error return path does not close the file fp and leaks
a file descriptor. Fix this by closing the file.

Fixes: 5ea7647b333f ("tools/power turbostat: Warn on bad ACPI LPIT data")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 1cd28ebf8443b..efc8d07364c61 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -2938,6 +2938,7 @@ int snapshot_sys_lpi_us(void)
 	if (retval != 1) {
 		fprintf(stderr, "Disabling Low Power Idle System output\n");
 		BIC_NOT_PRESENT(BIC_SYS_LPI);
+		fclose(fp);
 		return -1;
 	}
 	fclose(fp);