[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <b945de99-815a-b380-e13c-17b01e0febad@users.sourceforge.net>
Date: Wed, 14 Sep 2016 22:03:02 +0200
From: SF Markus Elfring <elfring@...rs.sourceforge.net>
To: linux-clk@...r.kernel.org,
Geert Uytterhoeven <geert+renesas@...der.be>,
Laurent Pinchart <laurent.pinchart@...asonboard.com>,
Michael Turquette <mturquette@...libre.com>,
Simon Horman <horms+renesas@...ge.net.au>,
Stephen Boyd <sboyd@...eaurora.org>,
Ulf Hansson <ulf.hansson@...aro.org>
Cc: LKML <linux-kernel@...r.kernel.org>,
kernel-janitors@...r.kernel.org,
Julia Lawall <julia.lawall@...6.fr>
Subject: [PATCH 3/4] clk/Renesas-MSTP: Less function calls in
cpg_mstp_clocks_init() after error detection
From: Markus Elfring <elfring@...rs.sourceforge.net>
Date: Wed, 14 Sep 2016 21:30:27 +0200
The kfree() function was called in up to two cases
by the cpg_mstp_clocks_init() function during error handling even if
the passed variable contained a null pointer.
* Split a condition check for memory allocation failures so that
each pointer from these function calls will be checked immediately.
See also background information:
Topic "CWE-754: Improper check for unusual or exceptional conditions"
Link: https://cwe.mitre.org/data/definitions/754.html
* Return directly after a call of the function "kzalloc" failed
at the beginning.
Signed-off-by: Markus Elfring <elfring@...rs.sourceforge.net>
---
drivers/clk/renesas/clk-mstp.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/clk/renesas/clk-mstp.c b/drivers/clk/renesas/clk-mstp.c
index 1fdc44b..6c82e0e 100644
--- a/drivers/clk/renesas/clk-mstp.c
+++ b/drivers/clk/renesas/clk-mstp.c
@@ -167,10 +167,12 @@ static void __init cpg_mstp_clocks_init(struct device_node *np)
unsigned int i;
group = kzalloc(sizeof(*group), GFP_KERNEL);
+ if (!group)
+ return;
+
clks = kmalloc_array(MSTP_MAX_CLOCKS, sizeof(*clks), GFP_KERNEL);
- if (group == NULL || clks == NULL) {
+ if (!clks) {
kfree(group);
- kfree(clks);
return;
}
--
2.10.0
Powered by blists - more mailing lists