| From 8a51a9c2b9ff246982524669c7cef9b3d742e57a Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 22 Apr 2022 11:22:27 +0800 |
| Subject: drm/msm/hdmi: check return value after calling |
| platform_get_resource_byname() |
| |
| From: Yang Yingliang <yangyingliang@huawei.com> |
| |
| [ Upstream commit a36e506711548df923ceb7ec9f6001375be799a5 ] |
| |
| It will cause null-ptr-deref if platform_get_resource_byname() returns NULL, |
| we need check the return value. |
| |
| Fixes: c6a57a50ad56 ("drm/msm/hdmi: add hdmi hdcp support (V3)") |
| Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> |
| Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> |
| Patchwork: https://patchwork.freedesktop.org/patch/482992/ |
| Link: https://lore.kernel.org/r/20220422032227.2991553-1-yangyingliang@huawei.com |
| Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/msm/hdmi/hdmi.c | 4 ++++ |
| 1 file changed, 4 insertions(+) |
| |
| diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c |
| index a968cad509c2..48ab46726707 100644 |
| --- a/drivers/gpu/drm/msm/hdmi/hdmi.c |
| +++ b/drivers/gpu/drm/msm/hdmi/hdmi.c |
| @@ -148,6 +148,10 @@ static struct hdmi *msm_hdmi_init(struct platform_device *pdev) |
| /* HDCP needs physical address of hdmi register */ |
| res = platform_get_resource_byname(pdev, IORESOURCE_MEM, |
| config->mmio_name); |
| + if (!res) { |
| + ret = -EINVAL; |
| + goto fail; |
| + } |
| hdmi->mmio_phy_addr = res->start; |
| |
| hdmi->qfprom_mmio = msm_ioremap(pdev, |
| -- |
| 2.35.1 |
| |