diff options
| author | Shailendra Verma <shailendra.v@samsung.com> | 2016-11-11 13:35:00 +0000 |
|---|---|---|
| committer | Liviu Dudau <Liviu.Dudau@arm.com> | 2017-01-23 09:46:24 +0000 |
| commit | 94d8b9b75c6118075ed54ad2fa0bea03c0f27145 (patch) | |
| tree | ba120c37956ee714f3663c0be411ae3357b7bcf8 /drivers/gpu/drm/arm | |
| parent | f0493e653f9679114d1dfd54ab88b54ce95576e1 (diff) | |
| download | linux-94d8b9b75c6118075ed54ad2fa0bea03c0f27145.tar.bz2 | |
drm/arm/malidp: Fix possible dereference of NULL
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 <Shailendra.v@samsung.com>
[cleaned up the code and re-formatted the commit message]
Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
Diffstat (limited to 'drivers/gpu/drm/arm')
| -rw-r--r-- | drivers/gpu/drm/arm/malidp_planes.c | 15 |
1 files 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; } |