Module Name: src
Committed By: skrll
Date: Wed Jan 15 08:21:00 UTC 2020
Modified Files:
src/sys/dev/usb: if_zyd.c
Log Message:
If malloc fails in zyd_node_alloc then return NULL. From nick-nhusb
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 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_zyd.c
diff -u src/sys/dev/usb/if_zyd.c:1.54 src/sys/dev/usb/if_zyd.c:1.55
--- src/sys/dev/usb/if_zyd.c:1.54 Wed Jan 15 08:20:13 2020
+++ src/sys/dev/usb/if_zyd.c Wed Jan 15 08:21:00 2020
@@ -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.54 2020/01/15 08:20:13 skrll Exp $ */
+/* $NetBSD: if_zyd.c,v 1.55 2020/01/15 08:21:00 skrll Exp $ */
/*-
* Copyright (c) 2006 by Damien Bergamini <damien.bergam...@free.fr>
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.54 2020/01/15 08:20:13 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.55 2020/01/15 08:21:00 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -662,8 +662,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
