Merge tag 'exynos-drm-next-for-v6.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes
Two fixups - Fix a potential error pointer dereference by checking the return value of exynos_drm_crtc_get_by_type() function before accessing to crtc object. - Fix a wrong error checking in exynos_drm_dma.c modules, which was reported by Dan[1] [1] https://lore.kernel.org/all/33e52277-1349-472b-a55b-ab5c3462bfcf@moroto.mountain/ Signed-off-by: Dave Airlie <airlied@redhat.com> From: Inki Dae <inki.dae@samsung.com> Link: https://patchwork.freedesktop.org/patch/msgid/20231207042223.2473706-1-inki.dae@samsung.com
This commit is contained in:
@ -107,18 +107,16 @@ int exynos_drm_register_dma(struct drm_device *drm, struct device *dev,
|
|||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (!priv->mapping) {
|
if (!priv->mapping) {
|
||||||
void *mapping;
|
void *mapping = NULL;
|
||||||
|
|
||||||
if (IS_ENABLED(CONFIG_ARM_DMA_USE_IOMMU))
|
if (IS_ENABLED(CONFIG_ARM_DMA_USE_IOMMU))
|
||||||
mapping = arm_iommu_create_mapping(&platform_bus_type,
|
mapping = arm_iommu_create_mapping(&platform_bus_type,
|
||||||
EXYNOS_DEV_ADDR_START, EXYNOS_DEV_ADDR_SIZE);
|
EXYNOS_DEV_ADDR_START, EXYNOS_DEV_ADDR_SIZE);
|
||||||
else if (IS_ENABLED(CONFIG_IOMMU_DMA))
|
else if (IS_ENABLED(CONFIG_IOMMU_DMA))
|
||||||
mapping = iommu_get_domain_for_dev(priv->dma_dev);
|
mapping = iommu_get_domain_for_dev(priv->dma_dev);
|
||||||
else
|
|
||||||
mapping = ERR_PTR(-ENODEV);
|
|
||||||
|
|
||||||
if (IS_ERR(mapping))
|
if (!mapping)
|
||||||
return PTR_ERR(mapping);
|
return -ENODEV;
|
||||||
priv->mapping = mapping;
|
priv->mapping = mapping;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1861,6 +1861,8 @@ static int hdmi_bind(struct device *dev, struct device *master, void *data)
|
|||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
crtc = exynos_drm_crtc_get_by_type(drm_dev, EXYNOS_DISPLAY_TYPE_HDMI);
|
crtc = exynos_drm_crtc_get_by_type(drm_dev, EXYNOS_DISPLAY_TYPE_HDMI);
|
||||||
|
if (IS_ERR(crtc))
|
||||||
|
return PTR_ERR(crtc);
|
||||||
crtc->pipe_clk = &hdata->phy_clk;
|
crtc->pipe_clk = &hdata->phy_clk;
|
||||||
|
|
||||||
ret = hdmi_create_connector(encoder);
|
ret = hdmi_create_connector(encoder);
|
||||||
|
Reference in New Issue
Block a user