* [PATCH] drm/msm/mdp5: Fix mdp5_cfg_init error return
@ 2019-05-01 16:14 Jeffrey Hugo
2019-05-01 16:51 ` Bjorn Andersson
0 siblings, 1 reply; 2+ messages in thread
From: Jeffrey Hugo @ 2019-05-01 16:14 UTC (permalink / raw)
To: robdclark, sean, airlied, daniel
Cc: linux-arm-msm, dri-devel, freedreno, linux-kernel, Jeffrey Hugo
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>
---
drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c
index ea8f7d7daf7f..52e23780fce1 100644
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c
@@ -721,7 +721,7 @@ struct mdp5_cfg_handler *mdp5_cfg_init(struct mdp5_kms *mdp5_kms,
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.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/msm/mdp5: Fix mdp5_cfg_init error return
2019-05-01 16:14 [PATCH] drm/msm/mdp5: Fix mdp5_cfg_init error return Jeffrey Hugo
@ 2019-05-01 16:51 ` Bjorn Andersson
0 siblings, 0 replies; 2+ messages in thread
From: Bjorn Andersson @ 2019-05-01 16:51 UTC (permalink / raw)
To: Jeffrey Hugo
Cc: robdclark, sean, airlied, daniel, linux-arm-msm, dri-devel,
freedreno, linux-kernel
On Wed 01 May 09:14 PDT 2019, Jeffrey Hugo wrote:
> 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)
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> Signed-off-by: Jeffrey Hugo <jeffrey.l.hugo@gmail.com>
> ---
> drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c
> index ea8f7d7daf7f..52e23780fce1 100644
> --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c
> +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c
> @@ -721,7 +721,7 @@ struct mdp5_cfg_handler *mdp5_cfg_init(struct mdp5_kms *mdp5_kms,
> 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.17.1
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-05-01 16:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-01 16:14 [PATCH] drm/msm/mdp5: Fix mdp5_cfg_init error return Jeffrey Hugo
2019-05-01 16:51 ` Bjorn Andersson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.