summaryrefslogtreecommitdiff
path: root/drivers/dma
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@linaro.org>2013-03-15 14:18:20 +0530
committerVinod Koul <vinod.koul@intel.com>2013-04-15 09:52:03 +0530
commit9a188eb126aa7bf27077ee46fcb914898d6fc281 (patch)
tree49a72638e45f8a23c0f5d106c4f720c187297b3f /drivers/dma
parentbef29ec508e58bf8b9ec0915de5b0739fb800c91 (diff)
downloadlinux-3.10-9a188eb126aa7bf27077ee46fcb914898d6fc281.tar.gz
linux-3.10-9a188eb126aa7bf27077ee46fcb914898d6fc281.tar.bz2
linux-3.10-9a188eb126aa7bf27077ee46fcb914898d6fc281.zip
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.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/dma/of-dma.c b/drivers/dma/of-dma.c
index 6036cd08e22..00db454f70d 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,
{
struct of_dma *ofdma;
int nbcells;
+ const __be32 *prop;
if (!np || !of_dma_xlate) {
pr_err("%s: not enough information provided\n", __func__);
@@ -103,8 +104,11 @@ int of_dma_controller_register(struct device_node *np,
if (!ofdma)
return -ENOMEM;
- nbcells = be32_to_cpup(of_get_property(np, "#dma-cells", NULL));
- if (!nbcells) {
+ prop = of_get_property(np, "#dma-cells", NULL);
+ if (prop)
+ nbcells = be32_to_cpup(prop);
+
+ if (!prop || !nbcells) {
pr_err("%s: #dma-cells property is missing or invalid\n",
__func__);
kfree(ofdma);