diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-01-29 00:48:20 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-01-29 00:48:20 +0000 |
| commit | 3ad7dfade1abdcd9199041fed6467ed93dce2cd6 (patch) | |
| tree | a0e434163c26d1847abc52e69b0f87c9d2bc8941 /sys | |
| parent | 2c13a9535c928edbb332af7a95991205a77d5a63 (diff) | |
Don't ask bus_dmamem_alloc() for zero bytes. 'bioctl -H x:y amiz' no
longer triggers a panic.
ok marco@ dlg@.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ic/ami.c | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/sys/dev/ic/ami.c b/sys/dev/ic/ami.c index c3e42006cfe..eff07d81355 100644 --- a/sys/dev/ic/ami.c +++ b/sys/dev/ic/ami.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ami.c,v 1.106 2005/12/21 12:26:24 dlg Exp $ */ +/* $OpenBSD: ami.c,v 1.107 2006/01/29 00:48:19 krw Exp $ */ /* * Copyright (c) 2001 Michael Shalayeff @@ -1735,19 +1735,21 @@ ami_mgmt(struct ami_softc *sc, u_int8_t opcode, u_int8_t par1, u_int8_t par2, { struct ami_ccb *ccb; struct ami_iocmd *cmd; - struct ami_mem *am; - char *idata; + struct ami_mem *am = NULL; + char *idata = NULL; int error = 0; ccb = ami_get_ccb(sc); if (ccb == NULL) return (ENOMEM); - if ((am = ami_allocmem(sc, size)) == NULL) { - ami_put_ccb(ccb); - return (ENOMEM); + if (size) { + if ((am = ami_allocmem(sc, size)) == NULL) { + ami_put_ccb(ccb); + return (ENOMEM); + } + idata = AMIMEM_KVA(am); } - idata = AMIMEM_KVA(am); ccb->ccb_data = NULL; ccb->ccb_wakeup = 1; @@ -1761,6 +1763,10 @@ ami_mgmt(struct ami_softc *sc, u_int8_t opcode, u_int8_t par1, u_int8_t par2, */ switch (opcode) { case AMI_SPEAKER: + if (!idata) { + ami_put_ccb(ccb); + return (ENOMEM); + } *idata = par1; break; default: @@ -1770,7 +1776,7 @@ ami_mgmt(struct ami_softc *sc, u_int8_t opcode, u_int8_t par1, u_int8_t par2, break; }; - cmd->acc_io.aio_data = htole32(AMIMEM_DVA(am)); + cmd->acc_io.aio_data = am ? htole32(AMIMEM_DVA(am)) : 0; if (ami_cmd(ccb, BUS_DMA_WAITOK, 0) == 0) { while (ccb->ccb_wakeup) @@ -1780,12 +1786,13 @@ ami_mgmt(struct ami_softc *sc, u_int8_t opcode, u_int8_t par1, u_int8_t par2, /* XXX how do commands fail? */ - if (buffer) + if (buffer && size) memcpy(buffer, idata, size); } else error = EINVAL; - ami_freemem(sc, am); + if (am) + ami_freemem(sc, am); return (error); } |