summaryrefslogtreecommitdiffstats
path: root/sys/pci
diff options
context:
space:
mode:
authorbz <bz@FreeBSD.org>2005-04-25 10:18:24 +0000
committerbz <bz@FreeBSD.org>2005-04-25 10:18:24 +0000
commitcd218c4d5b7cdae9454cffa7e7eba0090c228767 (patch)
tree3f1907ed11e412a3e95540e6eab366713e04cbbf /sys/pci
parent27733278299ba1f72e79d18e448b8571faf7a1c0 (diff)
downloadFreeBSD-src-cd218c4d5b7cdae9454cffa7e7eba0090c228767.zip
FreeBSD-src-cd218c4d5b7cdae9454cffa7e7eba0090c228767.tar.gz
Deal with failed malloc calls[1].
While there also check for failed device_add_child calls. Found by: Coventry Analysis tool[1]. Submitted by: sam[1] Approved by: pjd (mentor) MFC after: 1 week
Diffstat (limited to 'sys/pci')
-rw-r--r--sys/pci/if_sk.c22
1 files changed, 22 insertions, 0 deletions
diff --git a/sys/pci/if_sk.c b/sys/pci/if_sk.c
index 44bd447..9f148a1 100644
--- a/sys/pci/if_sk.c
+++ b/sys/pci/if_sk.c
@@ -1821,13 +1821,35 @@ skc_attach(dev)
}
sc->sk_devs[SK_PORT_A] = device_add_child(dev, "sk", -1);
+ if (sc->sk_devs[SK_PORT_A] == NULL) {
+ device_printf(dev, "failed to add child for PORT_A\n");
+ error = ENXIO;
+ goto fail;
+ }
port = malloc(sizeof(int), M_DEVBUF, M_NOWAIT);
+ if (port == NULL) {
+ device_printf(dev, "failed to allocate memory for "
+ "ivars of PORT_A\n");
+ error = ENXIO;
+ goto fail;
+ }
*port = SK_PORT_A;
device_set_ivars(sc->sk_devs[SK_PORT_A], port);
if (!(sk_win_read_1(sc, SK_CONFIG) & SK_CONFIG_SINGLEMAC)) {
sc->sk_devs[SK_PORT_B] = device_add_child(dev, "sk", -1);
+ if (sc->sk_devs[SK_PORT_B] == NULL) {
+ device_printf(dev, "failed to add child for PORT_B\n");
+ error = ENXIO;
+ goto fail;
+ }
port = malloc(sizeof(int), M_DEVBUF, M_NOWAIT);
+ if (port == NULL) {
+ device_printf(dev, "failed to allocate memory for "
+ "ivars of PORT_B\n");
+ error = ENXIO;
+ goto fail;
+ }
*port = SK_PORT_B;
device_set_ivars(sc->sk_devs[SK_PORT_B], port);
}
OpenPOWER on IntegriCloud