Module Name: src
Committed By: jdolecek
Date: Wed Jun 24 19:11:49 UTC 2020
Modified Files:
src/sys/dev/i2c: lm_i2c.c
src/sys/dev/isa: lm_isa_common.c
Log Message:
avoid stack usage in match routine
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/i2c/lm_i2c.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/isa/lm_isa_common.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/i2c/lm_i2c.c
diff -u src/sys/dev/i2c/lm_i2c.c:1.5 src/sys/dev/i2c/lm_i2c.c:1.6
--- src/sys/dev/i2c/lm_i2c.c:1.5 Sat Jun 16 21:22:13 2018
+++ src/sys/dev/i2c/lm_i2c.c Wed Jun 24 19:11:49 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lm_i2c.c,v 1.5 2018/06/16 21:22:13 thorpej Exp $ */
+/* $NetBSD: lm_i2c.c,v 1.6 2020/06/24 19:11:49 jdolecek Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,13 +30,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lm_i2c.c,v 1.5 2018/06/16 21:22:13 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lm_i2c.c,v 1.6 2020/06/24 19:11:49 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/conf.h>
+#include <sys/kmem.h>
#include <dev/i2c/i2cvar.h>
@@ -65,7 +66,7 @@ lm_i2c_match(device_t parent, cfdata_t m
{
struct i2c_attach_args *ia = aux;
int rv = 0;
- struct lm_i2c_softc sc;
+ struct lm_i2c_softc *sc;
/* Must supply an address */
if (ia->ia_addr < 1)
@@ -74,11 +75,13 @@ lm_i2c_match(device_t parent, cfdata_t m
/* XXXJRT filter addresses //at all// please? */
/* Bus independent probe */
- sc.sc_lmsc.lm_writereg = lm_i2c_writereg;
- sc.sc_lmsc.lm_readreg = lm_i2c_readreg;
- sc.sc_tag = ia->ia_tag;
- sc.sc_addr = ia->ia_addr;
- rv = lm_match(&sc.sc_lmsc);
+ sc = kmem_zalloc(sizeof(*sc), KM_SLEEP);
+ sc->sc_lmsc.lm_writereg = lm_i2c_writereg;
+ sc->sc_lmsc.lm_readreg = lm_i2c_readreg;
+ sc->sc_tag = ia->ia_tag;
+ sc->sc_addr = ia->ia_addr;
+ rv = lm_match(&sc->sc_lmsc);
+ kmem_free(sc, sizeof(*sc));
return rv ? I2C_MATCH_ADDRESS_AND_PROBE : 0;
}
Index: src/sys/dev/isa/lm_isa_common.c
diff -u src/sys/dev/isa/lm_isa_common.c:1.6 src/sys/dev/isa/lm_isa_common.c:1.7
--- src/sys/dev/isa/lm_isa_common.c:1.6 Fri Aug 18 04:07:51 2017
+++ src/sys/dev/isa/lm_isa_common.c Wed Jun 24 19:11:49 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lm_isa_common.c,v 1.6 2017/08/18 04:07:51 msaitoh Exp $ */
+/* $NetBSD: lm_isa_common.c,v 1.7 2020/06/24 19:11:49 jdolecek Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lm_isa_common.c,v 1.6 2017/08/18 04:07:51 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lm_isa_common.c,v 1.7 2020/06/24 19:11:49 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -38,6 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: lm_isa_commo
#include <sys/device.h>
#include <sys/module.h>
#include <sys/conf.h>
+#include <sys/kmem.h>
#include <sys/bus.h>
@@ -64,7 +65,7 @@ lm_isa_match(device_t parent, cfdata_t m
{
bus_space_handle_t ioh;
struct isa_attach_args *ia = aux;
- struct lm_isa_softc sc;
+ struct lm_isa_softc *sc;
int rv;
/* Must supply an address */
@@ -81,11 +82,13 @@ lm_isa_match(device_t parent, cfdata_t m
return 0;
/* Bus independent probe */
- sc.lm_iot = ia->ia_iot;
- sc.lm_ioh = ioh;
- sc.lmsc.lm_writereg = lm_isa_writereg;
- sc.lmsc.lm_readreg = lm_isa_readreg;
- rv = lm_match(&sc.lmsc);
+ sc = kmem_zalloc(sizeof(*sc), KM_SLEEP);
+ sc->lm_iot = ia->ia_iot;
+ sc->lm_ioh = ioh;
+ sc->lmsc.lm_writereg = lm_isa_writereg;
+ sc->lmsc.lm_readreg = lm_isa_readreg;
+ rv = lm_match(&sc->lmsc);
+ kmem_free(sc, sizeof(*sc));
bus_space_unmap(ia->ia_iot, ioh, 8);
