From: Shailendra Verma <[email protected]>

There is possible deference of NULL pointer on return of
malidp_duplicate_plane_state() if kmalloc fails. Check the
returned kmalloc pointer before continuing.

Signed-off-by: Shailendra Verma <[email protected]>
[cleaned up the code and re-formatted the commit message]
Signed-off-by: Liviu Dudau <[email protected]>
---
 drivers/gpu/drm/arm/malidp_planes.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/arm/malidp_planes.c 
b/drivers/gpu/drm/arm/malidp_planes.c
index eff2fe47e26a..d1cc15724dc3 100644
--- a/drivers/gpu/drm/arm/malidp_planes.c
+++ b/drivers/gpu/drm/arm/malidp_planes.c
@@ -67,13 +67,14 @@ drm_plane_state *malidp_duplicate_plane_state(struct 
drm_plane *plane)
                return NULL;
 
        state = kmalloc(sizeof(*state), GFP_KERNEL);
-       if (state) {
-               m_state = to_malidp_plane_state(plane->state);
-               __drm_atomic_helper_plane_duplicate_state(plane, &state->base);
-               state->rotmem_size = m_state->rotmem_size;
-               state->format = m_state->format;
-               state->n_planes = m_state->n_planes;
-       }
+       if (!state)
+               return NULL;
+
+       m_state = to_malidp_plane_state(plane->state);
+       __drm_atomic_helper_plane_duplicate_state(plane, &state->base);
+       state->rotmem_size = m_state->rotmem_size;
+       state->format = m_state->format;
+       state->n_planes = m_state->n_planes;
 
        return &state->base;
 }
-- 
2.11.0

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reply via email to