Browse Source

drm/crtc_helper: avoid NULL-pointer dereference when encoder is NULL

Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>
Maarten Maathuis 16 năm trước cách đây
mục cha
commit
ff6fdbed8f
1 tập tin đã thay đổi với 2 bổ sung1 xóa
  1. 2 1
      drivers/gpu/drm/drm_crtc_helper.c

+ 2 - 1
drivers/gpu/drm/drm_crtc_helper.c

@@ -842,7 +842,8 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
 			/* If the encoder is reused for another connector, then
 			/* If the encoder is reused for another connector, then
 			 * the appropriate crtc will be set later.
 			 * the appropriate crtc will be set later.
 			 */
 			 */
-			connector->encoder->crtc = NULL;
+			if (connector->encoder)
+				connector->encoder->crtc = NULL;
 			connector->encoder = new_encoder;
 			connector->encoder = new_encoder;
 		}
 		}
 	}
 	}