[src/netbsd-8]: src/sys/external/bsd/drm2/dist/drm Pull up the following revi...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9747d6230bdb
branches:  netbsd-8
changeset: 461065:9747d6230bdb
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Nov 14 15:55:59 2019 +0000

description:
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.

diffstat:

 sys/external/bsd/drm2/dist/drm/drm_fb_helper.c |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (14 lines):

diff -r e4bcbb02ce6e -r 9747d6230bdb sys/external/bsd/drm2/dist/drm/drm_fb_helper.c
--- a/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c    Thu Nov 14 15:53:39 2019 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c    Thu Nov 14 15:55:59 2019 +0000
@@ -1542,9 +1542,9 @@
        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;