From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D4E3713B79F; Tue, 27 Feb 2024 13:29:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709040586; cv=none; b=D8qgzYMm89JldNCxMmE2Usnwm1dGw+7rSAvi+yNT/gXtNapmEl3XNtMDRY6CFM1O5SWsW63onjDdSIAlhgfGfsRhV9rrjOwj4VhgQlYW95k1kPLeaORzxCAyOnrdv0GQJ3JTOrwwwKc22gFi2M7XzaHXnzvsEFZ+XCp9vw3UyZQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709040586; c=relaxed/simple; bh=JZgsttFTrI8bTVArx0rN4GhHNmUKY5VHtGAkdYpqIdE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mk2Np9rm8LwOMczBfK0B/5zbspJPovTrG7KR9PBNuyYrAKy/R+cbi9+lqFy9n/5/AErVnzA+qI1buYVyxWvsS+rDV86jCPq/w+yU93JaWAG06uklk4i96Ip1+vXYsOhY81B2fZ9LKZErpmz1RPUIuGwDRcq4Fkg++6mKnU7EKwM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=x7wDI+Qm; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="x7wDI+Qm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6088CC433C7; Tue, 27 Feb 2024 13:29:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1709040586; bh=JZgsttFTrI8bTVArx0rN4GhHNmUKY5VHtGAkdYpqIdE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=x7wDI+Qmq7SHRKVOZaStZSu0goiH7gpwYtnxs3NiwGwFxEnZmzktOx9c+kXd4q97+ sYFUC7GNHxtclf/eWZ8QquhwmQvuOW6lcytst516rOFY9cd6XS/CzZ1DqF6sS1LW10 51CuRj9r8HHS8l/Vd5y2R+9NPrMygO1R9dIf73e0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Kunwu Chan , Vinod Koul , Sasha Levin Subject: [PATCH 6.7 038/334] dmaengine: ti: edma: Add some null pointer checks to the edma_probe Date: Tue, 27 Feb 2024 14:18:16 +0100 Message-ID: <20240227131631.821760175@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240227131630.636392135@linuxfoundation.org> References: <20240227131630.636392135@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.7-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kunwu Chan [ Upstream commit 6e2276203ac9ff10fc76917ec9813c660f627369 ] devm_kasprintf() returns a pointer to dynamically allocated memory which can be NULL upon failure. Ensure the allocation was successful by checking the pointer validity. Signed-off-by: Kunwu Chan Link: https://lore.kernel.org/r/20240118031929.192192-1-chentao@kylinos.cn Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/ti/edma.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/dma/ti/edma.c b/drivers/dma/ti/edma.c index f1f920861fa9d..5f8d2e93ff3fb 100644 --- a/drivers/dma/ti/edma.c +++ b/drivers/dma/ti/edma.c @@ -2404,6 +2404,11 @@ static int edma_probe(struct platform_device *pdev) if (irq > 0) { irq_name = devm_kasprintf(dev, GFP_KERNEL, "%s_ccint", dev_name(dev)); + if (!irq_name) { + ret = -ENOMEM; + goto err_disable_pm; + } + ret = devm_request_irq(dev, irq, dma_irq_handler, 0, irq_name, ecc); if (ret) { @@ -2420,6 +2425,11 @@ static int edma_probe(struct platform_device *pdev) if (irq > 0) { irq_name = devm_kasprintf(dev, GFP_KERNEL, "%s_ccerrint", dev_name(dev)); + if (!irq_name) { + ret = -ENOMEM; + goto err_disable_pm; + } + ret = devm_request_irq(dev, irq, dma_ccerr_handler, 0, irq_name, ecc); if (ret) { -- 2.43.0