| From | Greg Kroah-Hartman <> | Subject | [ 114/218] DMA: PL330: Check the pointer returned by kzalloc | Date | Fri, 28 Sep 2012 13:15:31 -0700 |
| |
3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sachin Kamat <sachin.kamat@linaro.org>
commit 61c6e7531d3b66b33187b8cdd700fd8ab93ffd62 upstream.
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> Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- drivers/dma/pl330.c | 5 +++++ 1 file changed, 5 insertions(+)
--- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c @@ -2937,6 +2937,11 @@ pl330_probe(struct amba_device *adev, co 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];
|