Check result from malloc(9) when using M_NOWAIT. fgsch@ ok

6 files changed, 26 insertions, 6 deletions

diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c
index 0ca40dcf78d..8f1449f4f8b 100644
--- a/sys/dev/pci/if_bge.c
+++ b/sys/dev/pci/if_bge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bge.c,v 1.4 2001/12/24 18:30:43 mickey Exp $	*/
+/*	$OpenBSD: if_bge.c,v 1.5 2002/01/11 01:31:21 nordin Exp $	*/
 /*
  * Copyright (c) 2001 Wind River Systems
  * Copyright (c) 1997, 1998, 1999, 2001
@@ -300,6 +300,8 @@ bge_vpd_read(sc)
 
 	pos += sizeof(res);
 	sc->bge_vpd_prodname = malloc(res.vr_len + 1, M_DEVBUF, M_NOWAIT);
+	if (sc->bge_vpd_prodname == NULL)
+		panic("bge_vpd_read");
 	for (i = 0; i < res.vr_len; i++)
 		sc->bge_vpd_prodname[i] = bge_vpd_readbyte(sc, i + pos);
 	sc->bge_vpd_prodname[i] = '\0';
@@ -315,6 +317,8 @@ bge_vpd_read(sc)
 
 	pos += sizeof(res);
 	sc->bge_vpd_readonly = malloc(res.vr_len, M_DEVBUF, M_NOWAIT);
+	if (sc->bge_vpd_readonly == NULL)
+		panic("bge_vpd_read");
 	for (i = 0; i < res.vr_len + 1; i++)
 		sc->bge_vpd_readonly[i] = bge_vpd_readbyte(sc, i + pos);
 }
diff --git a/sys/dev/pci/if_dc_pci.c b/sys/dev/pci/if_dc_pci.c
index 6e8a07d8151..f5e44507bb8 100644
--- a/sys/dev/pci/if_dc_pci.c
+++ b/sys/dev/pci/if_dc_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_dc_pci.c,v 1.22 2001/12/13 17:43:03 nate Exp $	*/
+/*	$OpenBSD: if_dc_pci.c,v 1.23 2002/01/11 01:31:21 nordin Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -372,6 +372,8 @@ void dc_pci_attach(parent, self, aux)
 			sc->dc_flags |= DC_PNIC_RX_BUG_WAR;
 			sc->dc_pnic_rx_buf = malloc(DC_RXLEN * 5, M_DEVBUF,
 			    M_NOWAIT);
+			if (sc->dc_pnic_rx_buf == NULL)
+				panic("dc_pci_attach");
 			if (revision < DC_REVISION_82C169)
 				sc->dc_pmode = DC_PMODE_SYM;
 		}
diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c
index 554d817c649..85e2a052341 100644
--- a/sys/dev/pci/if_sk.c
+++ b/sys/dev/pci/if_sk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sk.c,v 1.19 2001/11/06 19:53:19 miod Exp $	*/
+/*	$OpenBSD: if_sk.c,v 1.20 2002/01/11 01:31:21 nordin Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -304,6 +304,8 @@ void sk_vpd_read(sc)
 
 	pos += sizeof(res);
 	sc->sk_vpd_prodname = malloc(res.vr_len + 1, M_DEVBUF, M_NOWAIT);
+	if (sc->sk_vpd_prodname == NULL)
+		panic("sk_vpd_read");
 	for (i = 0; i < res.vr_len; i++)
 		sc->sk_vpd_prodname[i] = sk_vpd_readbyte(sc, i + pos);
 	sc->sk_vpd_prodname[i] = '\0';
@@ -319,6 +321,8 @@ void sk_vpd_read(sc)
 
 	pos += sizeof(res);
 	sc->sk_vpd_readonly = malloc(res.vr_len, M_DEVBUF, M_NOWAIT);
+	if (sc->sk_vpd_readonly == NULL)
+		panic("sk_vpd_read");
 	for (i = 0; i < res.vr_len + 1; i++)
 		sc->sk_vpd_readonly[i] = sk_vpd_readbyte(sc, i + pos);
 
diff --git a/sys/dev/pci/if_ti.c b/sys/dev/pci/if_ti.c
index aec5e71a11e..2ed50d1e052 100644
--- a/sys/dev/pci/if_ti.c
+++ b/sys/dev/pci/if_ti.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ti.c,v 1.32 2001/12/13 23:52:15 niklas Exp $	*/
+/*	$OpenBSD: if_ti.c,v 1.33 2002/01/11 01:31:21 nordin Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -1071,6 +1071,8 @@ void ti_setmulti(sc)
 	ETHER_FIRST_MULTI(step, ac, enm);
 	while (enm != NULL) {
 		mc = malloc(sizeof(struct ti_mc_entry), M_DEVBUF, M_NOWAIT);
+		if (mc == NULL)
+			panic("ti_setmulti");
 		bcopy(enm->enm_addrlo, (char *)&mc->mc_addr, ETHER_ADDR_LEN);
 		LIST_INSERT_HEAD(&sc->ti_mc_listhead, mc, mc_entries);
 		ti_add_mcast(sc, &mc->mc_addr);
diff --git a/sys/dev/pcmcia/pcmcia.c b/sys/dev/pcmcia/pcmcia.c
index fc25386a5a0..4f5909f654c 100644
--- a/sys/dev/pcmcia/pcmcia.c
+++ b/sys/dev/pcmcia/pcmcia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcmcia.c,v 1.30 2001/08/17 21:52:16 deraadt Exp $	*/
+/*	$OpenBSD: pcmcia.c,v 1.31 2002/01/11 01:31:21 nordin Exp $	*/
 /*	$NetBSD: pcmcia.c,v 1.9 1998/08/13 02:10:55 eeh Exp $	*/
 
 /*
@@ -201,6 +201,8 @@ pcmcia_card_attach(dev)
 	 */
 	if (SIMPLEQ_FIRST(&sc->card.pf_head) == NULL) {
 		pf = malloc(sizeof *pf, M_DEVBUF, M_NOWAIT);
+		if (pf == NULL)
+			panic("pcmcia_card_attach");
 		bzero(pf, sizeof *pf);
 		pf->number = 0;
 		pf->pf_flags = PFF_FAKE;
diff --git a/sys/dev/pcmcia/pcmcia_cis.c b/sys/dev/pcmcia/pcmcia_cis.c
index fea548a7aa0..5603d305e7b 100644
--- a/sys/dev/pcmcia/pcmcia_cis.c
+++ b/sys/dev/pcmcia/pcmcia_cis.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcmcia_cis.c,v 1.5 2000/06/06 01:02:26 fgsch Exp $	*/
+/*	$OpenBSD: pcmcia_cis.c,v 1.6 2002/01/11 01:31:21 nordin Exp $	*/
 /*	$NetBSD: pcmcia_cis.c,v 1.9 1998/08/22 23:41:48 msaitoh Exp $	*/
 
 /*
@@ -803,6 +803,8 @@ pcmcia_parse_cis_tuple(tuple, arg)
 		if (state->pf == NULL) {
 			state->pf = malloc(sizeof(*state->pf), M_DEVBUF,
 			    M_NOWAIT);
+			if (state->pf == NULL)
+				panic("pcmcia_parse_cis_tuple");
 			bzero(state->pf, sizeof(*state->pf));
 			state->pf->number = state->count++;
 			state->pf->last_config_index = -1;
@@ -842,6 +844,8 @@ pcmcia_parse_cis_tuple(tuple, arg)
 			if (state->pf == NULL) {
 				state->pf = malloc(sizeof(*state->pf),
 				    M_DEVBUF, M_NOWAIT);
+				if (state->pf == NULL)
+					panic("pcmcia_parse_cis_tuple");
 				bzero(state->pf, sizeof(*state->pf));
 				state->pf->number = state->count++;
 				state->pf->last_config_index = -1;
@@ -919,6 +923,8 @@ pcmcia_parse_cis_tuple(tuple, arg)
 			if (num != state->default_cfe->number) {
 				cfe = (struct pcmcia_config_entry *)
 				    malloc(sizeof(*cfe), M_DEVBUF, M_NOWAIT);
+				if (cfe == NULL)
+					panic("pcmcia_parse_cis_tuple");
 
 				*cfe = *state->default_cfe;