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 8AC8427584E; Tue, 15 Jul 2025 13:20:22 +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=1752585622; cv=none; b=sDl5xvg6jCQhzT5G3/Ml5ygRbGPhTVIN1a1Zooy9nZlv9h5y1GyvFatUXNof/bRV6RDFPAYlMumBQ7MhS0UQFbWbuqiNMokSdV2iCWY/RiqnexWa+PZIAOaHOKEZ+oQoCl0cYvj0TE+WG/ESYRvtJbjvZ+cFBTQpYaQr/dsOFn8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752585622; c=relaxed/simple; bh=A5UIK3mYuk3drWGV7K/TDumquz3ZcnwyXmf2Ye7hmhs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IFVZOJyquZzMJL3rhIDxidIKaoq6zOSt38kNHYrJYt3cZbc44P4N0YY7zDb6DedGDdALokJP5HyBxjHtFfR75GjZIjcts24MqvzCaMPLcq7/M72ylSJvF+9bWiztRM1AfSG5yAPGcmdu/LuWwVplrBp3yWhRknO9/Nie4sKtB10= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=LmmNICff; 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="LmmNICff" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1F857C4CEE3; Tue, 15 Jul 2025 13:20:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1752585622; bh=A5UIK3mYuk3drWGV7K/TDumquz3ZcnwyXmf2Ye7hmhs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LmmNICff77aVk36+CzdAuFLh8quTSrpyGddk9ekPUedhS0iY2fXxOdMtt5kvlDpBD B9RnvrXhXOdtN/Zpps7LtjW+yLbHAwI0WqRdMuM6EVVaTXLBxted+DVDT29EhFZY/X QrTdnSvvutzU001F6chWdJN9oUE7kP7tAthORKuc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mikko Perttunen , Thierry Reding , Sasha Levin Subject: [PATCH 6.12 109/163] drm/tegra: nvdec: Fix dma_alloc_coherent error check Date: Tue, 15 Jul 2025 15:12:57 +0200 Message-ID: <20250715130813.230427132@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250715130808.777350091@linuxfoundation.org> References: <20250715130808.777350091@linuxfoundation.org> User-Agent: quilt/0.68 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.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mikko Perttunen [ Upstream commit 44306a684cd1699b8562a54945ddc43e2abc9eab ] Check for NULL return value with dma_alloc_coherent, in line with Robin's fix for vic.c in 'drm/tegra: vic: Fix DMA API misuse'. Fixes: 46f226c93d35 ("drm/tegra: Add NVDEC driver") Signed-off-by: Mikko Perttunen Signed-off-by: Thierry Reding Link: https://lore.kernel.org/r/20250702-nvdec-dma-error-check-v1-1-c388b402c53a@nvidia.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/tegra/nvdec.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/tegra/nvdec.c b/drivers/gpu/drm/tegra/nvdec.c index 4860790666af5..14ef61b44f47c 100644 --- a/drivers/gpu/drm/tegra/nvdec.c +++ b/drivers/gpu/drm/tegra/nvdec.c @@ -261,10 +261,8 @@ static int nvdec_load_falcon_firmware(struct nvdec *nvdec) if (!client->group) { virt = dma_alloc_coherent(nvdec->dev, size, &iova, GFP_KERNEL); - - err = dma_mapping_error(nvdec->dev, iova); - if (err < 0) - return err; + if (!virt) + return -ENOMEM; } else { virt = tegra_drm_alloc(tegra, size, &iova); if (IS_ERR(virt)) -- 2.39.5