From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Mon, 17 Sep 2012 09:50:23 +0000 (+0530)
Subject: DMA: PL330: Check the pointer returned by kzalloc
X-Git-Tag: upstream/snapshot3+hdmi~6676^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=61c6e7531d3b66b33187b8cdd700fd8ab93ffd62;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

DMA: PL330: Check the pointer returned by kzalloc

kzalloc could return NULL. Hence add a check to avoid
NULL pointer dereference.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Jassi Brar <jassisinghbrar@gmail.com>
Cc: Stable <stable@vger.kernel.org>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
---

diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index a3b26ad..f5843bc 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -2930,6 +2930,11 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
 		num_chan = max_t(int, pi->pcfg.num_peri, pi->pcfg.num_chan);
 
 	pdmac->peripherals = kzalloc(num_chan * sizeof(*pch), GFP_KERNEL);
+	if (!pdmac->peripherals) {
+		ret = -ENOMEM;
+		dev_err(&adev->dev, "unable to allocate pdmac->peripherals\n");
+		goto probe_err5;
+	}
 
 	for (i = 0; i < num_chan; i++) {
 		pch = &pdmac->peripherals[i];