Patchwork [4/6] X86: intel_ips, check for kzalloc properly

login
register
mail settings
Submitter Leann Ogasawara
Date Aug. 18, 2010, 1:27 a.m.
Message ID <9b71ef9de4680145fd9eaf45c9a08a38a4748c11.1282089274.git.leann.ogasawara@canonical.com>
Download mbox | patch
Permalink /patch/61981/
State Accepted
Delegated to: Leann Ogasawara
Headers show

Comments

Leann Ogasawara - Aug. 18, 2010, 1:27 a.m.
BugLink: http://bugs.launchpad.net/bugs/601057

Stanse found that there are two NULL checks missing in ips_monitor. So
check their value too and bail out appropriately if the allocation
failed.

While at it, add one more kfree to the fail path. It is not necessary
now, but may be needed in the future when a new allocation is added.
And for completeness.

Also remove unneeded initialization of the variables. They are all set
right after their declaration.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
(cherry picked from commit e9ec7f3539cbeae8ffc5d7b30543e5612df5cba3)

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
---
 drivers/platform/x86/intel_ips.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

Patch

diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel_ips.c
index cdaf40e..0344822 100644
--- a/drivers/platform/x86/intel_ips.c
+++ b/drivers/platform/x86/intel_ips.c
@@ -920,9 +920,8 @@  static int ips_monitor(void *data)
 	struct timer_list timer;
 	unsigned long seqno_timestamp, expire, last_msecs, last_sample_period;
 	int i;
-	u32 *cpu_samples = NULL, *mchp_samples = NULL, old_cpu_power;
-	u16 *mcp_samples = NULL, *ctv1_samples = NULL, *ctv2_samples = NULL,
-		*mch_samples = NULL;
+	u32 *cpu_samples, *mchp_samples, old_cpu_power;
+	u16 *mcp_samples, *ctv1_samples, *ctv2_samples, *mch_samples;
 	u8 cur_seqno, last_seqno;
 
 	mcp_samples = kzalloc(sizeof(u16) * IPS_SAMPLE_COUNT, GFP_KERNEL);
@@ -931,7 +930,8 @@  static int ips_monitor(void *data)
 	mch_samples = kzalloc(sizeof(u16) * IPS_SAMPLE_COUNT, GFP_KERNEL);
 	cpu_samples = kzalloc(sizeof(u32) * IPS_SAMPLE_COUNT, GFP_KERNEL);
 	mchp_samples = kzalloc(sizeof(u32) * IPS_SAMPLE_COUNT, GFP_KERNEL);
-	if (!mcp_samples || !ctv1_samples || !ctv2_samples || !mch_samples) {
+	if (!mcp_samples || !ctv1_samples || !ctv2_samples || !mch_samples ||
+			!cpu_samples || !mchp_samples) {
 		dev_err(&ips->dev->dev,
 			"failed to allocate sample array, ips disabled\n");
 		kfree(mcp_samples);
@@ -939,6 +939,7 @@  static int ips_monitor(void *data)
 		kfree(ctv2_samples);
 		kfree(mch_samples);
 		kfree(cpu_samples);
+		kfree(mchp_samples);
 		kthread_stop(ips->adjust);
 		return -ENOMEM;
 	}