diff options
author | Viresh Kumar <viresh.kumar@linaro.org> | 2013-03-15 04:48:20 -0400 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2013-04-15 00:22:03 -0400 |
commit | 9a188eb126aa7bf27077ee46fcb914898d6fc281 (patch) | |
tree | 49a72638e45f8a23c0f5d106c4f720c187297b3f /drivers/dma | |
parent | bef29ec508e58bf8b9ec0915de5b0739fb800c91 (diff) |
DMA: OF: Check properties value before running be32_to_cpup() on it
In of_dma_controller_register() routine we are calling of_get_property() as an
parameter to be32_to_cpup(). In case the property doesn't exist we will get a
crash.
This patch changes this code to check if we got a valid property first and then
runs be32_to_cpup() on it.
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r-- | drivers/dma/of-dma.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/dma/of-dma.c b/drivers/dma/of-dma.c index 6036cd08e222..00db454f70d3 100644 --- a/drivers/dma/of-dma.c +++ b/drivers/dma/of-dma.c | |||
@@ -93,6 +93,7 @@ int of_dma_controller_register(struct device_node *np, | |||
93 | { | 93 | { |
94 | struct of_dma *ofdma; | 94 | struct of_dma *ofdma; |
95 | int nbcells; | 95 | int nbcells; |
96 | const __be32 *prop; | ||
96 | 97 | ||
97 | if (!np || !of_dma_xlate) { | 98 | if (!np || !of_dma_xlate) { |
98 | pr_err("%s: not enough information provided\n", __func__); | 99 | pr_err("%s: not enough information provided\n", __func__); |
@@ -103,8 +104,11 @@ int of_dma_controller_register(struct device_node *np, | |||
103 | if (!ofdma) | 104 | if (!ofdma) |
104 | return -ENOMEM; | 105 | return -ENOMEM; |
105 | 106 | ||
106 | nbcells = be32_to_cpup(of_get_property(np, "#dma-cells", NULL)); | 107 | prop = of_get_property(np, "#dma-cells", NULL); |
107 | if (!nbcells) { | 108 | if (prop) |
109 | nbcells = be32_to_cpup(prop); | ||
110 | |||
111 | if (!prop || !nbcells) { | ||
108 | pr_err("%s: #dma-cells property is missing or invalid\n", | 112 | pr_err("%s: #dma-cells property is missing or invalid\n", |
109 | __func__); | 113 | __func__); |
110 | kfree(ofdma); | 114 | kfree(ofdma); |