Module Name: src
Committed By: mlelstv
Date: Wed Jun 29 17:59:40 UTC 2022
Modified Files:
src/sys/arch/macppc/dev: ki2c.c
Log Message:
Use old limit of 32 + 32 bytes to keep combining buffer on stack.
There are no devices on this platform that need more and for larger
values, the driver should be better rewritten.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/macppc/dev/ki2c.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/macppc/dev/ki2c.c
diff -u src/sys/arch/macppc/dev/ki2c.c:1.32 src/sys/arch/macppc/dev/ki2c.c:1.33
--- src/sys/arch/macppc/dev/ki2c.c:1.32 Sat Aug 7 16:18:57 2021
+++ src/sys/arch/macppc/dev/ki2c.c Wed Jun 29 17:59:40 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ki2c.c,v 1.32 2021/08/07 16:18:57 thorpej Exp $ */
+/* $NetBSD: ki2c.c,v 1.33 2022/06/29 17:59:40 mlelstv Exp $ */
/* Id: ki2c.c,v 1.7 2002/10/05 09:56:05 tsubai Exp */
/*-
@@ -44,6 +44,9 @@
#define DPRINTF while (0) printf
#endif
+#define KI2C_EXEC_MAX_CMDLEN 32
+#define KI2C_EXEC_MAX_BUFLEN 32
+
int ki2c_match(device_t, cfdata_t, void *);
void ki2c_attach(device_t, device_t, void *);
inline uint8_t ki2c_readreg(struct ki2c_softc *, int);
@@ -393,7 +396,7 @@ ki2c_i2c_exec(void *cookie, i2c_op_t op,
int i;
size_t w_len;
uint8_t *wp;
- uint8_t wrbuf[I2C_EXEC_MAX_CMDLEN + I2C_EXEC_MAX_CMDLEN];
+ uint8_t wrbuf[KI2C_EXEC_MAX_CMDLEN + KI2C_EXEC_MAX_CMDLEN];
uint8_t channel;
/*
@@ -404,6 +407,13 @@ ki2c_i2c_exec(void *cookie, i2c_op_t op,
if (cmdlen == 0 && buflen == 0)
return -1;
+ /*
+ * Transaction could be much larger now. Bail if it exceeds our
+ * small combining buffer, we don't expect such devices.
+ */
+ if (cmdlen + buflen > sizeof(wrbuf))
+ return -1;
+
channel = (addr & 0xf80) ? 0x10 : 0x00;
addr &= 0x7f;
