From 11aab5f9c38229ee1e9db3bf15841fb3a57e6088 Mon Sep 17 00:00:00 2001 From: Jayaprakash Date: Mon, 6 Apr 2020 19:08:57 +0530 Subject: [PATCH] disp: msm: sde: Fix null dereference errors Add changes to avoid NULL dereference access and uninitalized access in sde driver. Change-Id: Ic9c06f54d1ccd820973fc0ba4aa75d2848f2ce03 Signed-off-by: Jayaprakash --- msm/sde/sde_core_perf.c | 3 +++ msm/sde/sde_rm.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/msm/sde/sde_core_perf.c b/msm/sde/sde_core_perf.c index 9d94ddedd25b..0a0cac365021 100644 --- a/msm/sde/sde_core_perf.c +++ b/msm/sde/sde_core_perf.c @@ -818,6 +818,9 @@ static void _sde_core_perf_crtc_update_check(struct drm_crtc *crtc, struct sde_core_perf_params *new = &sde_crtc->new_perf; int i; + if (!kms) + return; + for (i = 0; i < SDE_POWER_HANDLE_DBUS_ID_MAX; i++) { /* * cases for bus bandwidth update. diff --git a/msm/sde/sde_rm.c b/msm/sde/sde_rm.c index 5e648914e9a2..25c9ab6ec7b7 100644 --- a/msm/sde/sde_rm.c +++ b/msm/sde/sde_rm.c @@ -2346,7 +2346,7 @@ int sde_rm_reserve( * comes again after earlier commit gets processed. */ - if (test_only && rsvp_nxt) { + if (test_only && rsvp_cur && rsvp_nxt) { SDE_ERROR("cur %d nxt %d enc %d conn %d\n", rsvp_cur->seq, rsvp_nxt->seq, enc->base.id, conn_state->connector->base.id);