CVS commit: src/sys/dev/wscons

[Taylor R Campbell]

Module Name:    src
Committed By:   riastradh
Date:           Thu Feb 23 02:48:07 UTC 2023

Modified Files:
        src/sys/dev/wscons: wsemul_vt100.c wsemul_vt100_subr.c

Log Message:
wscons(4): Paranoia: Clamp numbers of rows and columns.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/wscons/wsemul_vt100.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/wscons/wsemul_vt100_subr.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/dev/wscons/wsemul_vt100.c
diff -u src/sys/dev/wscons/wsemul_vt100.c:1.49 src/sys/dev/wscons/wsemul_vt100.c:1.50
--- src/sys/dev/wscons/wsemul_vt100.c:1.49	Sun Jan  2 23:46:21 2022
+++ src/sys/dev/wscons/wsemul_vt100.c	Thu Feb 23 02:48:06 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: wsemul_vt100.c,v 1.49 2022/01/02 23:46:21 uwe Exp $	*/
+/*	$NetBSD: wsemul_vt100.c,v 1.50 2023/02/23 02:48:06 riastradh Exp $	*/
 
 /*
  * Copyright (c) 1998
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100.c,v 1.49 2022/01/02 23:46:21 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100.c,v 1.50 2023/02/23 02:48:06 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_wsmsgattrs.h"
@@ -293,8 +293,14 @@ wsemul_vt100_resize(void * cookie, const
 {
 	struct wsemul_vt100_emuldata *edp = cookie;
 
-	edp->bd.nrows = type->nrows;
-	edp->bd.ncols = type->ncols;
+	/* XXX match malloc size in wsemul_vt100_attach */
+	KASSERT(type->nrows >= 0);
+	KASSERT(type->ncols >= 0);
+	KASSERT(type->nrows <= 1024);
+	KASSERT(type->ncols <= 1024);
+
+	edp->bd.nrows = MAX(0, MIN(type->nrows, 1024));
+	edp->bd.ncols = MAX(0, MIN(type->ncols, 1024));
 	wsemul_vt100_reset(edp);
 	wsemul_vt100_resetop(cookie, WSEMUL_CLEARSCREEN);
 }

Index: src/sys/dev/wscons/wsemul_vt100_subr.c
diff -u src/sys/dev/wscons/wsemul_vt100_subr.c:1.27 src/sys/dev/wscons/wsemul_vt100_subr.c:1.28
--- src/sys/dev/wscons/wsemul_vt100_subr.c:1.27	Thu Feb 23 02:47:52 2023
+++ src/sys/dev/wscons/wsemul_vt100_subr.c	Thu Feb 23 02:48:06 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: wsemul_vt100_subr.c,v 1.27 2023/02/23 02:47:52 riastradh Exp $ */
+/* $NetBSD: wsemul_vt100_subr.c,v 1.28 2023/02/23 02:48:06 riastradh Exp $ */
 
 /*
  * Copyright (c) 1998
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100_subr.c,v 1.27 2023/02/23 02:47:52 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100_subr.c,v 1.28 2023/02/23 02:48:06 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -767,6 +767,8 @@ wsemul_vt100_handle_dcs(struct vt100base
 		return;
 	    case DCSTYPE_TABRESTORE:
 		KASSERT(edp->tabs != 0);
+		KASSERT(edp->ncols >= 0);
+		KASSERT(edp->ncols <= 1024);
 		memset(edp->tabs, 0, edp->ncols);
 		pos = 0;
 		for (i = 0; i < edp->dcspos; i++) {