| From a27998345f0581b78e8d54df2f8edb4e575f8531 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 21 May 2019 08:00:30 -0700 |
| Subject: drm/msm/mdp5: Fix mdp5_cfg_init error return |
| |
| From: Jeffrey Hugo <jeffrey.l.hugo@gmail.com> |
| |
| [ Upstream commit fc19cbb785d7bbd1a1af26229b5240a3ab332744 ] |
| |
| If mdp5_cfg_init fails because of an unknown major version, a null pointer |
| dereference occurs. This is because the caller of init expects error |
| pointers, but init returns NULL on error. Fix this by returning the |
| expected values on error. |
| |
| Fixes: 2e362e1772b8 (drm/msm/mdp5: introduce mdp5_cfg module) |
| Signed-off-by: Jeffrey Hugo <jeffrey.l.hugo@gmail.com> |
| Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> |
| Signed-off-by: Rob Clark <robdclark@chromium.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c |
| index 8b4e3004f4518..86b0448d2ce58 100644 |
| --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c |
| +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c |
| @@ -542,7 +542,7 @@ fail: |
| if (cfg_handler) |
| mdp5_cfg_destroy(cfg_handler); |
| |
| - return NULL; |
| + return ERR_PTR(ret); |
| } |
| |
| static struct mdp5_cfg_platform *mdp5_get_config(struct platform_device *dev) |
| -- |
| 2.20.1 |
| |
