Module Name: src
Committed By: martin
Date: Thu Nov 14 15:55:59 UTC 2019
Modified Files:
src/sys/external/bsd/drm2/dist/drm [netbsd-8]: drm_fb_helper.c
Log Message:
Pull up the following revision, requested by msaitoh in ticket #1436:
external/bsd/drm2/dist/drm/drm_fb_helper.c 1.13 via patch
Avoid null pointer dereference.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.10.1 \
src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c:1.8 src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c:1.8.10.1
--- src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c:1.8 Sat Nov 14 13:27:29 2015
+++ src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c Thu Nov 14 15:55:59 2019
@@ -1542,9 +1542,9 @@ static void drm_setup_crtcs(struct drm_f
for (i = 0; i < fb_helper->connector_count; i++) {
struct drm_display_mode *mode = modes[i];
struct drm_fb_helper_crtc *fb_crtc = crtcs[i];
- modeset = &fb_crtc->mode_set;
if (mode && fb_crtc) {
+ modeset = &fb_crtc->mode_set;
DRM_DEBUG_KMS("desired mode %s set on crtc %d\n",
mode->name, fb_crtc->mode_set.crtc->base.id);
fb_crtc->desired_mode = mode;
