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 74053482D9; Mon, 11 Dec 2023 14:02:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="fP3SeVbb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 016FEC433CA; Mon, 11 Dec 2023 14:02:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702303369; bh=CAabmz3YfzsbQjyDogsRvJLdEPcFoGXEQ9nrIXkGRf4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fP3SeVbb1PllAHuIjO33vbO32A9jP7dKdBV761wYZqKoB8jl7FQ/m5uZ4dEpPQhcp GIVdlXy0h6sDCBfPfr7QDxyLQdJWbwZuT0q3a5P/FDXM7L3vbA8urAgqKOjdn7l/ZA Rhf+KRdHE+w9VcPQ3qUf7Lwj8EwriDiCl3Ky/bgG4BuA+txCFnrCl0+Fdbtzd8ZRGa J8KQCGteUotrgOS6ESzeHne8jgK6qMWXmj15uDc2pu34UJlV4b+XajKhhugbLWmB48 yPawLesEpnaIcmLsDHgLI+sEheGI+OXKaSxMPzbZwzgW3aDmFAnFC1T0fTgcEWCQD4 m/Z1da6uNP9jA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Inki Dae , Sasha Levin , sw0312.kim@samsung.com, kyungmin.park@samsung.com, airlied@gmail.com, daniel@ffwll.ch, krzysztof.kozlowski@linaro.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 12/12] drm/exynos: fix a wrong error checking Date: Mon, 11 Dec 2023 09:02:05 -0500 Message-ID: <20231211140219.392379-12-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231211140219.392379-1-sashal@kernel.org> References: <20231211140219.392379-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-samsung-soc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.4.263 Content-Transfer-Encoding: 8bit From: Inki Dae [ Upstream commit 8d1b7809684c688005706125b804e1f9792d2b1b ] Fix a wrong error checking in exynos_drm_dma.c module. In the exynos_drm_register_dma function, both arm_iommu_create_mapping() and iommu_get_domain_for_dev() functions are expected to return NULL as an error. However, the error checking is performed using the statement if(IS_ERR(mapping)), which doesn't provide a suitable error value. So check if 'mapping' is NULL, and if it is, return -ENODEV. This issue[1] was reported by Dan. Changelog v1: - fix build warning. [1] https://lore.kernel.org/all/33e52277-1349-472b-a55b-ab5c3462bfcf@moroto.mountain/ Reported-by : Dan Carpenter Signed-off-by: Inki Dae Signed-off-by: Sasha Levin --- drivers/gpu/drm/exynos/exynos_drm_dma.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_dma.c b/drivers/gpu/drm/exynos/exynos_drm_dma.c index a3c9d8b9e1a18..e07d31b9a921a 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_dma.c +++ b/drivers/gpu/drm/exynos/exynos_drm_dma.c @@ -133,18 +133,16 @@ int exynos_drm_register_dma(struct drm_device *drm, struct device *dev, return 0; if (!priv->mapping) { - void *mapping; + void *mapping = NULL; if (IS_ENABLED(CONFIG_ARM_DMA_USE_IOMMU)) mapping = arm_iommu_create_mapping(&platform_bus_type, EXYNOS_DEV_ADDR_START, EXYNOS_DEV_ADDR_SIZE); else if (IS_ENABLED(CONFIG_IOMMU_DMA)) mapping = iommu_get_domain_for_dev(priv->dma_dev); - else - mapping = ERR_PTR(-ENODEV); - if (IS_ERR(mapping)) - return PTR_ERR(mapping); + if (!mapping) + return -ENODEV; priv->mapping = mapping; } -- 2.42.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 44D03C4167B for ; Mon, 11 Dec 2023 15:15:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=uCHVI+TpMqRAaXDGAI+3HsBALTqnjgwubnyRJ/Ax62E=; b=i76RNRq3Mf6G4X hyVze0i5C2bAx6YIYvL6zxb0WuN7S/bZPur9rTR9FBmQj1AtyzGqsdVvgap2lL8m3hfypwUKnL+pz EP3cZ1eaAibqMBMjuXj7w7F/I3zzQfNhwO5unmcLkhVFriDM76OnEpna1UPmpsLNkFSg9yC8ztRIg cdhGx7XtTjRlDOtb2z9U3MrkvrH1EnaQROQtJNiC1Vf6lqWqoJYzYmTgGeSVgWE9Fv4oCnP5D1YMg idhTOh+0Zf2OEqgvZy9cOHQZMeEsY9ejcJ3+Ox60x7frT386xryBBHGVv8U/Rdu6TkS1HzZ+Ifs7L 5/IS4TFb3dRjs7jr+rHw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rCi0K-005LwC-03; Mon, 11 Dec 2023 15:15:32 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rCgs9-0054rm-0H for linux-arm-kernel@bombadil.infradead.org; Mon, 11 Dec 2023 14:03:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=rwHTFYzWLExZ5LVJGZkudFsQr0sLK7ps/w5pc8fw/9o=; b=HEcbvxgBctvO8x7EN4ZXlP9myj OYTOvJDfPJmwUKcZqrTvrZkv2r+Hp6O0iOzO/Q36rwuBXNUjr3Oho2nhYQNqBuEBeMeo8T21PsLuM BrsGgTFGhDGO08paO2GmpYyxh7tv/Y+fYxGxByLRx+hhLCLF2GDRnTSn9Jb0yOGJJmehdsma+D/sm Qv5igoGW0T0E2Mhkey3nXLIzjz98qFUPJ7cn9++CIiFVUoDH+5k48egkRRVqq0xZoHde7kmobUpvj QKe5YMHFu7BhS/vwkTfo4oypkQ/dXZB+2Il0dt2yWG1GLNXDjeKYcKdGOJkNP/j6ZkzlVK1Syaf+g iqHzYqEg==; Received: from ams.source.kernel.org ([145.40.68.75]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rCgs4-0086PL-1e for linux-arm-kernel@lists.infradead.org; Mon, 11 Dec 2023 14:03:00 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by ams.source.kernel.org (Postfix) with ESMTP id 9E5C4B80E63; Mon, 11 Dec 2023 14:02:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 016FEC433CA; Mon, 11 Dec 2023 14:02:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702303369; bh=CAabmz3YfzsbQjyDogsRvJLdEPcFoGXEQ9nrIXkGRf4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fP3SeVbb1PllAHuIjO33vbO32A9jP7dKdBV761wYZqKoB8jl7FQ/m5uZ4dEpPQhcp GIVdlXy0h6sDCBfPfr7QDxyLQdJWbwZuT0q3a5P/FDXM7L3vbA8urAgqKOjdn7l/ZA Rhf+KRdHE+w9VcPQ3qUf7Lwj8EwriDiCl3Ky/bgG4BuA+txCFnrCl0+Fdbtzd8ZRGa J8KQCGteUotrgOS6ESzeHne8jgK6qMWXmj15uDc2pu34UJlV4b+XajKhhugbLWmB48 yPawLesEpnaIcmLsDHgLI+sEheGI+OXKaSxMPzbZwzgW3aDmFAnFC1T0fTgcEWCQD4 m/Z1da6uNP9jA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Inki Dae , Sasha Levin , sw0312.kim@samsung.com, kyungmin.park@samsung.com, airlied@gmail.com, daniel@ffwll.ch, krzysztof.kozlowski@linaro.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 12/12] drm/exynos: fix a wrong error checking Date: Mon, 11 Dec 2023 09:02:05 -0500 Message-ID: <20231211140219.392379-12-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231211140219.392379-1-sashal@kernel.org> References: <20231211140219.392379-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.4.263 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231211_140256_634834_F9BA288B X-CRM114-Status: GOOD ( 11.27 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Inki Dae [ Upstream commit 8d1b7809684c688005706125b804e1f9792d2b1b ] Fix a wrong error checking in exynos_drm_dma.c module. In the exynos_drm_register_dma function, both arm_iommu_create_mapping() and iommu_get_domain_for_dev() functions are expected to return NULL as an error. However, the error checking is performed using the statement if(IS_ERR(mapping)), which doesn't provide a suitable error value. So check if 'mapping' is NULL, and if it is, return -ENODEV. This issue[1] was reported by Dan. Changelog v1: - fix build warning. [1] https://lore.kernel.org/all/33e52277-1349-472b-a55b-ab5c3462bfcf@moroto.mountain/ Reported-by : Dan Carpenter Signed-off-by: Inki Dae Signed-off-by: Sasha Levin --- drivers/gpu/drm/exynos/exynos_drm_dma.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_dma.c b/drivers/gpu/drm/exynos/exynos_drm_dma.c index a3c9d8b9e1a18..e07d31b9a921a 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_dma.c +++ b/drivers/gpu/drm/exynos/exynos_drm_dma.c @@ -133,18 +133,16 @@ int exynos_drm_register_dma(struct drm_device *drm, struct device *dev, return 0; if (!priv->mapping) { - void *mapping; + void *mapping = NULL; if (IS_ENABLED(CONFIG_ARM_DMA_USE_IOMMU)) mapping = arm_iommu_create_mapping(&platform_bus_type, EXYNOS_DEV_ADDR_START, EXYNOS_DEV_ADDR_SIZE); else if (IS_ENABLED(CONFIG_IOMMU_DMA)) mapping = iommu_get_domain_for_dev(priv->dma_dev); - else - mapping = ERR_PTR(-ENODEV); - if (IS_ERR(mapping)) - return PTR_ERR(mapping); + if (!mapping) + return -ENODEV; priv->mapping = mapping; } -- 2.42.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2F0AFC10F05 for ; Mon, 11 Dec 2023 14:02:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6688A10E45F; Mon, 11 Dec 2023 14:02:55 +0000 (UTC) Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by gabe.freedesktop.org (Postfix) with ESMTPS id 346DD10E45B for ; Mon, 11 Dec 2023 14:02:51 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by ams.source.kernel.org (Postfix) with ESMTP id 9E5C4B80E63; Mon, 11 Dec 2023 14:02:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 016FEC433CA; Mon, 11 Dec 2023 14:02:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702303369; bh=CAabmz3YfzsbQjyDogsRvJLdEPcFoGXEQ9nrIXkGRf4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fP3SeVbb1PllAHuIjO33vbO32A9jP7dKdBV761wYZqKoB8jl7FQ/m5uZ4dEpPQhcp GIVdlXy0h6sDCBfPfr7QDxyLQdJWbwZuT0q3a5P/FDXM7L3vbA8urAgqKOjdn7l/ZA Rhf+KRdHE+w9VcPQ3qUf7Lwj8EwriDiCl3Ky/bgG4BuA+txCFnrCl0+Fdbtzd8ZRGa J8KQCGteUotrgOS6ESzeHne8jgK6qMWXmj15uDc2pu34UJlV4b+XajKhhugbLWmB48 yPawLesEpnaIcmLsDHgLI+sEheGI+OXKaSxMPzbZwzgW3aDmFAnFC1T0fTgcEWCQD4 m/Z1da6uNP9jA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 12/12] drm/exynos: fix a wrong error checking Date: Mon, 11 Dec 2023 09:02:05 -0500 Message-ID: <20231211140219.392379-12-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231211140219.392379-1-sashal@kernel.org> References: <20231211140219.392379-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.4.263 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , linux-samsung-soc@vger.kernel.org, sw0312.kim@samsung.com, krzysztof.kozlowski@linaro.org, dri-devel@lists.freedesktop.org, kyungmin.park@samsung.com, linux-arm-kernel@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Inki Dae [ Upstream commit 8d1b7809684c688005706125b804e1f9792d2b1b ] Fix a wrong error checking in exynos_drm_dma.c module. In the exynos_drm_register_dma function, both arm_iommu_create_mapping() and iommu_get_domain_for_dev() functions are expected to return NULL as an error. However, the error checking is performed using the statement if(IS_ERR(mapping)), which doesn't provide a suitable error value. So check if 'mapping' is NULL, and if it is, return -ENODEV. This issue[1] was reported by Dan. Changelog v1: - fix build warning. [1] https://lore.kernel.org/all/33e52277-1349-472b-a55b-ab5c3462bfcf@moroto.mountain/ Reported-by : Dan Carpenter Signed-off-by: Inki Dae Signed-off-by: Sasha Levin --- drivers/gpu/drm/exynos/exynos_drm_dma.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_dma.c b/drivers/gpu/drm/exynos/exynos_drm_dma.c index a3c9d8b9e1a18..e07d31b9a921a 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_dma.c +++ b/drivers/gpu/drm/exynos/exynos_drm_dma.c @@ -133,18 +133,16 @@ int exynos_drm_register_dma(struct drm_device *drm, struct device *dev, return 0; if (!priv->mapping) { - void *mapping; + void *mapping = NULL; if (IS_ENABLED(CONFIG_ARM_DMA_USE_IOMMU)) mapping = arm_iommu_create_mapping(&platform_bus_type, EXYNOS_DEV_ADDR_START, EXYNOS_DEV_ADDR_SIZE); else if (IS_ENABLED(CONFIG_IOMMU_DMA)) mapping = iommu_get_domain_for_dev(priv->dma_dev); - else - mapping = ERR_PTR(-ENODEV); - if (IS_ERR(mapping)) - return PTR_ERR(mapping); + if (!mapping) + return -ENODEV; priv->mapping = mapping; } -- 2.42.0