Module Name: src
Committed By: skrll
Date: Wed Feb 1 07:55:08 UTC 2017
Modified Files:
src/sys/dev/usb [nick-nhusb]: if_otus.c if_zyd.c
Log Message:
Be more careful about malloc returning NULL
To generate a diff of this commit:
cvs rdiff -u -r1.25.6.9 -r1.25.6.10 src/sys/dev/usb/if_otus.c
cvs rdiff -u -r1.36.14.13 -r1.36.14.14 src/sys/dev/usb/if_zyd.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/usb/if_otus.c
diff -u src/sys/dev/usb/if_otus.c:1.25.6.9 src/sys/dev/usb/if_otus.c:1.25.6.10
--- src/sys/dev/usb/if_otus.c:1.25.6.9 Mon Dec 5 10:55:18 2016
+++ src/sys/dev/usb/if_otus.c Wed Feb 1 07:55:08 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_otus.c,v 1.25.6.9 2016/12/05 10:55:18 skrll Exp $ */
+/* $NetBSD: if_otus.c,v 1.25.6.10 2017/02/01 07:55:08 skrll Exp $ */
/* $OpenBSD: if_otus.c,v 1.18 2010/08/27 17:08:00 jsg Exp $ */
/*-
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_otus.c,v 1.25.6.9 2016/12/05 10:55:18 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_otus.c,v 1.25.6.10 2017/02/01 07:55:08 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1493,7 +1493,7 @@ otus_node_alloc(struct ieee80211_node_ta
DPRINTFN(DBG_FN, DBG_NO_SC, "\n");
on = malloc(sizeof(*on), M_DEVBUF, M_NOWAIT | M_ZERO);
- return &on->ni;
+ return on ? &on->ni : NULL;
}
Static int
Index: src/sys/dev/usb/if_zyd.c
diff -u src/sys/dev/usb/if_zyd.c:1.36.14.13 src/sys/dev/usb/if_zyd.c:1.36.14.14
--- src/sys/dev/usb/if_zyd.c:1.36.14.13 Sat Jan 28 12:12:19 2017
+++ src/sys/dev/usb/if_zyd.c Wed Feb 1 07:55:08 2017
@@ -1,5 +1,5 @@
/* $OpenBSD: if_zyd.c,v 1.52 2007/02/11 00:08:04 jsg Exp $ */
-/* $NetBSD: if_zyd.c,v 1.36.14.13 2017/01/28 12:12:19 skrll Exp $ */
+/* $NetBSD: if_zyd.c,v 1.36.14.14 2017/02/01 07:55:08 skrll Exp $ */
/*-
* Copyright (c) 2006 by Damien Bergamini <[email protected]>
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.36.14.13 2017/01/28 12:12:19 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.36.14.14 2017/02/01 07:55:08 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -672,8 +672,7 @@ zyd_node_alloc(struct ieee80211_node_tab
struct zyd_node *zn;
zn = malloc(sizeof(struct zyd_node), M_80211_NODE, M_NOWAIT | M_ZERO);
-
- return &zn->ni;
+ return zn ? &zn->ni : NULL;
}
Static int
