[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20120405084808.GA21060@glitch>
Date: Thu, 5 Apr 2012 10:48:08 +0200
From: Domenico Andreoli <cavokz@...il.com>
To: Mike Turquette <mturquette@...aro.org>
Cc: Arnd Bergman <arnd.bergmann@...aro.org>,
Rob Herring <rob.herring@...xeda.com>,
Andrew Lunn <andrew@...n.ch>,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org
Subject: common clk: fix clk_register_fixed_rate() under memory pressure
From: Domenico Andreoli <cavokz@...il.com>
Under memory pressure clk_register_fixed_rate() fails to manage
allocation errors and prepares land for a later WARN_ON at best.
This fix leaves parent_names correctly initialized or NULL, intermediate
half initialized states are cleaned up and not propagated to the clock
framework.
Signed-off-by: Domenico Andreoli <cavokz@...il.com>
Cc: Mike Turquette <mturquette@...aro.org>
Cc: Arnd Bergman <arnd.bergmann@...aro.org>
Cc: Rob Herring <rob.herring@...xeda.com>
Cc: Andrew Lunn <andrew@...n.ch>
---
drivers/clk/clk-fixed-rate.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
Index: b/drivers/clk/clk-fixed-rate.c
===================================================================
--- a/drivers/clk/clk-fixed-rate.c
+++ b/drivers/clk/clk-fixed-rate.c
@@ -67,8 +67,11 @@ struct clk *clk_register_fixed_rate(stru
parent_names[0] = kmalloc(len, GFP_KERNEL);
- if (!parent_names[0])
+ if (!parent_names[0]) {
+ kfree(parent_names);
+ parent_names = NULL;
goto out;
+ }
strncpy(parent_names[0], parent_name, len);
}
@@ -77,6 +80,6 @@ out:
return clk_register(dev, name,
&clk_fixed_rate_ops, &fixed->hw,
parent_names,
- (parent_name ? 1 : 0),
+ (parent_names ? 1 : 0),
flags);
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists