[Intel-gfx] [PATCH 1/5] Fixing Possible Null Pointer Dereference
Nischal Varide
nischal.varide at intel.com
Mon Aug 24 03:45:52 UTC 2020
There is a possble Null Pointer dereference in intel_atomic.c and this
patch fixes the same by introducting a check to old_state, new_state
old_conn_state and new_conn_state variables.
Signed-off-by: Nischal Varide <nischal.varide at intel.com>
---
drivers/gpu/drm/i915/display/intel_atomic.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/gpu/drm/i915/display/intel_atomic.c b/drivers/gpu/drm/i915/display/intel_atomic.c
index 630f49b7aa01..ab58f061c8a7 100644
--- a/drivers/gpu/drm/i915/display/intel_atomic.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic.c
@@ -132,6 +132,9 @@ int intel_digital_connector_atomic_check(struct drm_connector *conn,
to_intel_digital_connector_state(old_state);
struct drm_crtc_state *crtc_state;
+ if (!(new_state && new_conn_state && old_state && old_conn_state))
+ return 0;
+
intel_hdcp_atomic_check(conn, old_state, new_state);
intel_psr_atomic_check(conn, old_state, new_state);
@@ -192,6 +195,8 @@ intel_connector_needs_modeset(struct intel_atomic_state *state,
old_conn_state = drm_atomic_get_old_connector_state(&state->base, connector);
new_conn_state = drm_atomic_get_new_connector_state(&state->base, connector);
+ if (!(old_conn_state && new_conn_state))
+ return 0;
return old_conn_state->crtc != new_conn_state->crtc ||
(new_conn_state->crtc &&
--
2.26.0
More information about the Intel-gfx
mailing list