* [PATCH] drm/fsl-dcu: Fix no fb check bug
@ 2015-08-31 3:39 Jianwei Wang
2015-11-16 22:34 ` Stefan Agner
0 siblings, 1 reply; 2+ messages in thread
From: Jianwei Wang @ 2015-08-31 3:39 UTC (permalink / raw)
To: dri-devel; +Cc: linux-kernel, linux-arm-kernel, airlied, Jianwei Wang
For state->fb may be NULL in fsl_dcu_drm_plane_atomic_check function,
if so, return -EINVAL. No need check in fsl_dcu_drm_plane_atomic_update
anymore.
Signed-off-by: Jianwei Wang <jianwei.wang.chn@gmail.com>
---
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c
index 82be6b8..8787920 100644
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c
@@ -41,6 +41,9 @@ static int fsl_dcu_drm_plane_atomic_check(struct drm_plane *plane,
{
struct drm_framebuffer *fb = state->fb;
+ if (!fb)
+ return -EINVAL;
+
switch (fb->pixel_format) {
case DRM_FORMAT_RGB565:
case DRM_FORMAT_RGB888:
@@ -84,9 +87,6 @@ static void fsl_dcu_drm_plane_atomic_update(struct drm_plane *plane,
unsigned int alpha, bpp;
int index, ret;
- if (!fb)
- return;
-
index = fsl_dcu_drm_plane_index(plane);
if (index < 0)
return;
--
2.1.0.27.g96db324
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/fsl-dcu: Fix no fb check bug
2015-08-31 3:39 [PATCH] drm/fsl-dcu: Fix no fb check bug Jianwei Wang
@ 2015-11-16 22:34 ` Stefan Agner
0 siblings, 0 replies; 2+ messages in thread
From: Stefan Agner @ 2015-11-16 22:34 UTC (permalink / raw)
To: airlied
Cc: dri-devel, Jianwei Wang <jianwei.wang.chn@gmail.com>,
linux-arm-kernel
Hi,
This avoids a NULL pointer dereference when no crtc is available (e.g.
the fsl,panel not assigned).
Any chance to get this into 4.4?
Tested-by: Stefan Agner <stefan@agner.ch>
--
Stefan
On 2015-08-30 20:39, Jianwei Wang wrote:
> For state->fb may be NULL in fsl_dcu_drm_plane_atomic_check function,
> if so, return -EINVAL. No need check in fsl_dcu_drm_plane_atomic_update
> anymore.
>
> Signed-off-by: Jianwei Wang <jianwei.wang.chn@gmail.com>
> ---
> drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c
> b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c
> index 82be6b8..8787920 100644
> --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c
> +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c
> @@ -41,6 +41,9 @@ static int fsl_dcu_drm_plane_atomic_check(struct
> drm_plane *plane,
> {
> struct drm_framebuffer *fb = state->fb;
>
> + if (!fb)
> + return -EINVAL;
> +
> switch (fb->pixel_format) {
> case DRM_FORMAT_RGB565:
> case DRM_FORMAT_RGB888:
> @@ -84,9 +87,6 @@ static void fsl_dcu_drm_plane_atomic_update(struct
> drm_plane *plane,
> unsigned int alpha, bpp;
> int index, ret;
>
> - if (!fb)
> - return;
> -
> index = fsl_dcu_drm_plane_index(plane);
> if (index < 0)
> return;
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-11-16 22:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-08-31 3:39 [PATCH] drm/fsl-dcu: Fix no fb check bug Jianwei Wang
2015-11-16 22:34 ` Stefan Agner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).