From: Arvind Yadav <arvind.yadav...@gmail.com>

commit 0c8b794c4a10aaf7ac0d4a49be2b2638e2038adb upstream

devm_kasprintf() can fail here and we must check its return value.

Signed-off-by: Arvind Yadav <arvind.yadav...@gmail.com>
Acked-by: Peter Ujfalusi <peter.ujfal...@ti.com>
Signed-off-by: Mark Brown <broo...@kernel.org>
Signed-off-by: Mathieu Poirier <mathieu.poir...@linaro.org>
---
 sound/soc/davinci/davinci-mcasp.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/sound/soc/davinci/davinci-mcasp.c 
b/sound/soc/davinci/davinci-mcasp.c
index 0480ec4c8035..af6cd8b874f5 100644
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -1894,6 +1894,10 @@ static int davinci_mcasp_probe(struct platform_device 
*pdev)
        if (irq >= 0) {
                irq_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%s_common",
                                          dev_name(&pdev->dev));
+               if (!irq_name) {
+                       ret = -ENOMEM;
+                       goto err;
+               }
                ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
                                                
davinci_mcasp_common_irq_handler,
                                                IRQF_ONESHOT | IRQF_SHARED,
@@ -1911,6 +1915,10 @@ static int davinci_mcasp_probe(struct platform_device 
*pdev)
        if (irq >= 0) {
                irq_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%s_rx",
                                          dev_name(&pdev->dev));
+               if (!irq_name) {
+                       ret = -ENOMEM;
+                       goto err;
+               }
                ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
                                                davinci_mcasp_rx_irq_handler,
                                                IRQF_ONESHOT, irq_name, mcasp);
@@ -1926,6 +1934,10 @@ static int davinci_mcasp_probe(struct platform_device 
*pdev)
        if (irq >= 0) {
                irq_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%s_tx",
                                          dev_name(&pdev->dev));
+               if (!irq_name) {
+                       ret = -ENOMEM;
+                       goto err;
+               }
                ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
                                                davinci_mcasp_tx_irq_handler,
                                                IRQF_ONESHOT, irq_name, mcasp);
-- 
2.17.1

Reply via email to