Module Name: src
Committed By: hans
Date: Tue Mar 4 15:34:42 UTC 2025
Modified Files:
src/sys/arch/vax/vsa: dz_vsbus.c
Log Message:
vax/dz(4): fix NULL pointer dereference in dzgetc()
This fixes an immediate reboot situation when booting with -d on a
framebuffer console that utilizes a dz(4)-attached keyboard.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/vax/vsa/dz_vsbus.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/arch/vax/vsa/dz_vsbus.c
diff -u src/sys/arch/vax/vsa/dz_vsbus.c:1.50 src/sys/arch/vax/vsa/dz_vsbus.c:1.51
--- src/sys/arch/vax/vsa/dz_vsbus.c:1.50 Tue Mar 4 14:31:07 2025
+++ src/sys/arch/vax/vsa/dz_vsbus.c Tue Mar 4 15:34:42 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: dz_vsbus.c,v 1.50 2025/03/04 14:31:07 hans Exp $ */
+/* $NetBSD: dz_vsbus.c,v 1.51 2025/03/04 15:34:42 hans Exp $ */
/*
* Copyright (c) 1998 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dz_vsbus.c,v 1.50 2025/03/04 14:31:07 hans Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dz_vsbus.c,v 1.51 2025/03/04 15:34:42 hans Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -339,10 +339,13 @@ dzcnpollc(dev_t dev, int pollflag)
int
dzgetc(struct dz_linestate *ls)
{
- int line = ls->dz_line;
+ int line = 0;
int s;
u_short rbuf;
+ if (ls != NULL)
+ line = ls->dz_line;
+
s = spltty();
for (;;) {
for(; (dz->csr & DZ_CSR_RX_DONE) == 0;);
