Module Name: src
Committed By: mrg
Date: Tue Sep 5 05:55:12 UTC 2023
Modified Files:
src/sys/dev/pckbport: pms.c synaptics.c
Log Message:
panic on an condition that shouldn't be possible.
appease GCC 12.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/pckbport/pms.c
cvs rdiff -u -r1.81 -r1.82 src/sys/dev/pckbport/synaptics.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/pckbport/pms.c
diff -u src/sys/dev/pckbport/pms.c:1.40 src/sys/dev/pckbport/pms.c:1.41
--- src/sys/dev/pckbport/pms.c:1.40 Fri Oct 28 23:40:37 2022
+++ src/sys/dev/pckbport/pms.c Tue Sep 5 05:55:12 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pms.c,v 1.40 2022/10/28 23:40:37 riastradh Exp $ */
+/* $NetBSD: pms.c,v 1.41 2023/09/05 05:55:12 mrg Exp $ */
/*-
* Copyright (c) 2004 Kentaro Kurahone.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pms.c,v 1.40 2022/10/28 23:40:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pms.c,v 1.41 2023/09/05 05:55:12 mrg Exp $");
#include "opt_pms.h"
@@ -561,6 +561,8 @@ pmsinput(void *vsc, int data)
if ((data & 0xc0) != 0)
return; /* not in sync yet, discard input */
}
+ if (sc->inputstate >= sizeof(sc->packet))
+ panic("inputstate should never be %d", sc->inputstate);
sc->packet[sc->inputstate++] = data & 0xff;
switch (sc->inputstate) {
Index: src/sys/dev/pckbport/synaptics.c
diff -u src/sys/dev/pckbport/synaptics.c:1.81 src/sys/dev/pckbport/synaptics.c:1.82
--- src/sys/dev/pckbport/synaptics.c:1.81 Wed Sep 28 16:43:00 2022
+++ src/sys/dev/pckbport/synaptics.c Tue Sep 5 05:55:12 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: synaptics.c,v 1.81 2022/09/28 16:43:00 nia Exp $ */
+/* $NetBSD: synaptics.c,v 1.82 2023/09/05 05:55:12 mrg Exp $ */
/*
* Copyright (c) 2005, Steve C. Woodford
@@ -48,7 +48,7 @@
#include "opt_pms.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.81 2022/09/28 16:43:00 nia Exp $");
+__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.82 2023/09/05 05:55:12 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1759,6 +1759,8 @@ pms_synaptics_input(void *vsc, int data)
return;
}
}
+ if (psc->inputstate >= sizeof(psc->packet))
+ panic("inputstate should never be %d", psc->inputstate);
psc->packet[psc->inputstate++] = data & 0xff;
if (psc->inputstate == 6) {
