diff options
| author | riastradh <riastradh@NetBSD.org> | 2022-01-14 22:26:45 +0000 |
|---|---|---|
| committer | riastradh <riastradh@NetBSD.org> | 2022-01-14 22:26:45 +0000 |
| commit | cf72ac6c70cc4b25b96dbb7576eb9979c053095e (patch) | |
| tree | 339f5fd219311c0a6a8a96c0a0cfe13b73663453 /sys/dev | |
| parent | 73cf9e9df75eef45cac41a8ae29c98273c61cc48 (diff) | |
ihidev(4): Check kmem_alloc(..., KM_NOSLEEP) for failure.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/i2c/ihidev.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/sys/dev/i2c/ihidev.c b/sys/dev/i2c/ihidev.c index 4f858225a1f..1c9209d41d1 100644 --- a/sys/dev/i2c/ihidev.c +++ b/sys/dev/i2c/ihidev.c @@ -1,4 +1,4 @@ -/* $NetBSD: ihidev.c,v 1.22 2022/01/14 22:26:35 riastradh Exp $ */ +/* $NetBSD: ihidev.c,v 1.23 2022/01/14 22:26:45 riastradh Exp $ */ /* $OpenBSD ihidev.c,v 1.13 2017/04/08 02:57:23 deraadt Exp $ */ /*- @@ -54,7 +54,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ihidev.c,v 1.22 2022/01/14 22:26:35 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ihidev.c,v 1.23 2022/01/14 22:26:45 riastradh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -416,6 +416,13 @@ ihidev_hid_command(struct ihidev_softc *sc, int hidcmd, void *arg, bool poll) */ report_len += report_id_len; tmprep = kmem_zalloc(report_len, KM_NOSLEEP); + if (tmprep == NULL) { + /* XXX pool or preallocate? */ + DPRINTF(("%s: out of memory\n", + device_xname(sc->sc_dev))); + res = ENOMEM; + break; + } /* type 3 id 8: 22 00 38 02 23 00 */ res = iic_exec(sc->sc_tag, I2C_OP_READ_WITH_STOP, sc->sc_addr, @@ -507,6 +514,10 @@ ihidev_hid_command(struct ihidev_softc *sc, int hidcmd, void *arg, bool poll) cmd[dataoff] = rreq->id; finalcmd = kmem_zalloc(cmdlen + rreq->len, KM_NOSLEEP); + if (finalcmd == NULL) { + res = ENOMEM; + break; + } memcpy(finalcmd, cmd, cmdlen); memcpy(finalcmd + cmdlen, rreq->data, rreq->len); |
