Module Name: src
Committed By: riastradh
Date: Sun Dec 19 12:08:18 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_fb_helper.c
Log Message:
drm: Avoid null pointer deref for drivers with atomic modeset.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 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.25 src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c:1.26
--- src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c:1.25 Sun Dec 19 12:04:59 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c Sun Dec 19 12:08:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_fb_helper.c,v 1.25 2021/12/19 12:04:59 riastradh Exp $ */
+/* $NetBSD: drm_fb_helper.c,v 1.26 2021/12/19 12:08:18 riastradh 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.25 2021/12/19 12:04:59 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_fb_helper.c,v 1.26 2021/12/19 12:08:18 riastradh Exp $");
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
@@ -175,11 +175,11 @@ int drm_fb_helper_debug_enter_fb(struct
if (!mode_set->crtc->enabled)
continue;
- funcs = mode_set->crtc->helper_private;
- if (funcs->mode_set_base_atomic == NULL)
+ if (drm_drv_uses_atomic_modeset(mode_set->crtc->dev))
continue;
- if (drm_drv_uses_atomic_modeset(mode_set->crtc->dev))
+ funcs = mode_set->crtc->helper_private;
+ if (funcs->mode_set_base_atomic == NULL)
continue;
funcs->mode_set_base_atomic(mode_set->crtc,
