common clk: fix clk_register_fixed_rate() under memory pressure

April 05th, 2012 - 04:50 am ET by Domenico Andreoli | Report spam
From: Domenico Andreoli <cavokz@gmail.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@gmail.com>
Cc: Mike Turquette <mturquette@linaro.org>
Cc: Arnd Bergman <arnd.bergmann@linaro.org>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Andrew Lunn <andrew@lunn.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@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
email Follow the discussionReplies 2 repliesReplies Make a reply

Replies

#1 Turquette, Mike
April 09th, 2012 - 06:00 pm ET | Report spam
On Thu, Apr 5, 2012 at 1:48 AM, Domenico Andreoli wrote:
From: Domenico Andreoli

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



Thanks for the patch Domenico. I did a big cleanup of the
registration code for all of the basic clock types and a fix for this
has already been rolled in to that branch, so I won't be taking this
patch. I'll Cc you on the fixes when I send them to the list
(probably tomorrow).

Regards,
Mike

Cc: Mike Turquette
Cc: Arnd Bergman
Cc: Rob Herring
Cc: Andrew Lunn


 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);
 }

_______________________________________________
linux-arm-kernel mailing list

http://lists.infradead.org/mailman/...arm-kernel


To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Similar topics