Module Name: src
Committed By: msaitoh
Date: Tue Nov 5 04:09:51 UTC 2019
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_fb_helper.c
Log Message:
Avoid null pointer dereference found by kUBSan with "member access within
null pointer of type 'struct drm_fb_helper_crtc'".
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 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.12 src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c:1.13
--- src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c:1.12 Mon Aug 27 13:37:21 2018
+++ src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c Tue Nov 5 04:09:51 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_fb_helper.c,v 1.12 2018/08/27 13:37:21 riastradh Exp $ */
+/* $NetBSD: drm_fb_helper.c,v 1.13 2019/11/05 04:09:51 msaitoh Exp $ */
/*
* Copyright (c) 2006-2009 Red Hat Inc.
@@ -30,7 +30,7 @@
* Jesse Barnes <jesse.bar...@intel.com>
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_fb_helper.c,v 1.12 2018/08/27 13:37:21 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_fb_helper.c,v 1.13 2019/11/05 04:09:51 msaitoh Exp $");
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
@@ -2086,9 +2086,9 @@ static void drm_setup_crtcs(struct drm_f
struct drm_display_mode *mode = modes[i];
struct drm_fb_helper_crtc *fb_crtc = crtcs[i];
struct drm_fb_offset *offset = &offsets[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 (%d,%d)\n",
mode->name, fb_crtc->mode_set.crtc->base.id, offset->x, offset->y);
fb_crtc->desired_mode = mode;
