From: Hui Tang <tanghui20@huawei.com>

Date: Sat, 19 Nov 2022 13:55:18 +0800

Subject: [PATCH] drm/msm/dpu: check for null return of devm_kzalloc() in

 dpu_writeback_init()

References: bsc#1012628

Patch-mainline: 6.2.3

Git-commit: 21e9a838f505178e109ccb3bf19d7808eb0326f4

[ Upstream commit 21e9a838f505178e109ccb3bf19d7808eb0326f4 ]

Because of the possilble failure of devm_kzalloc(), dpu_wb_conn might

be NULL and will cause null pointer dereference later.

Therefore, it might be better to check it and directly return -ENOMEM.

Fixes: 77b001acdcfe ("drm/msm/dpu: add the writeback connector layer")

Signed-off-by: Hui Tang <tanghui20@huawei.com>

Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>

Patchwork: https://patchwork.freedesktop.org/patch/512277/

Link: https://lore.kernel.org/r/20221119055518.179937-1-tanghui20@huawei.com

[DB: fixed typo in commit message]

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

Signed-off-by: Sasha Levin <sashal@kernel.org>

Signed-off-by: Jiri Slaby <jslaby@suse.cz>

---

 drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c | 2 ++

 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c

index 088ec990..2a5a6836 100644

--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c

+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c

@@ -70,6 +70,8 @@ int dpu_writeback_init(struct drm_device *dev, struct drm_encoder *enc,

 	int rc = 0;

 	dpu_wb_conn = devm_kzalloc(dev->dev, sizeof(*dpu_wb_conn), GFP_KERNEL);

+	if (!dpu_wb_conn)

+		return -ENOMEM;

 	drm_connector_helper_add(&dpu_wb_conn->base.base, &dpu_wb_conn_helper_funcs);

-- 

2.35.3