From c2d2bf6758a3906cebd3245efd29fac71047bed0 Mon Sep 17 00:00:00 2001 From: Clarence Ip Date: Mon, 18 Jul 2016 19:07:24 -0400 Subject: drm/msm/sde: avoid dereferencing scaler blob if null state Add checks to avoid dereferencing the user scaler blob if the plane state is null, which is possible if the scaler configuration is requested internally. Change-Id: I497cdd8e2d35afa842451321eee98ae3b9c34bf2 Signed-off-by: Clarence Ip --- drivers/gpu/drm/msm/sde/sde_plane.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'drivers/gpu') diff --git a/drivers/gpu/drm/msm/sde/sde_plane.c b/drivers/gpu/drm/msm/sde/sde_plane.c index 99d1d9349f8b..5bc99ad36bfc 100644 --- a/drivers/gpu/drm/msm/sde/sde_plane.c +++ b/drivers/gpu/drm/msm/sde/sde_plane.c @@ -477,11 +477,11 @@ static void _sde_plane_setup_scaler(struct sde_plane *psde, memset(pe, 0, sizeof(struct sde_hw_pixel_ext)); /* get scaler config from user space */ - /* get scaler config from user space */ - sc_u = msm_property_get_blob(&psde->property_info, - pstate->property_blobs, - &sc_u_size, - PLANE_PROP_SCALER); + if (pstate) + sc_u = msm_property_get_blob(&psde->property_info, + pstate->property_blobs, + &sc_u_size, + PLANE_PROP_SCALER); if (sc_u) { switch (sc_u->version) { case SDE_DRM_SCALER_V1: -- cgit v1.2.3