summaryrefslogtreecommitdiffstats
path: root/sys/net80211
diff options
context:
space:
mode:
authorsam <sam@FreeBSD.org>2005-12-12 17:40:49 +0000
committersam <sam@FreeBSD.org>2005-12-12 17:40:49 +0000
commit4c5cf2f0f19cd9e60956aa3d9626effcafffdeff (patch)
treedf4cc64bab7b3ea7eab2b32845df28db26302db3 /sys/net80211
parent4b58922473cf884bce48eab874ea136f1301ca0b (diff)
downloadFreeBSD-src-4c5cf2f0f19cd9e60956aa3d9626effcafffdeff.zip
FreeBSD-src-4c5cf2f0f19cd9e60956aa3d9626effcafffdeff.tar.gz
change malloc when setting an optional ie to use M_NOWAIT
MFC after: 3 days
Diffstat (limited to 'sys/net80211')
-rw-r--r--sys/net80211/ieee80211_ioctl.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c
index 8e676f2..8a15ca8 100644
--- a/sys/net80211/ieee80211_ioctl.c
+++ b/sys/net80211/ieee80211_ioctl.c
@@ -1509,8 +1509,7 @@ ieee80211_ioctl_setoptie(struct ieee80211com *ic, struct ieee80211req *ireq)
return EINVAL;
if (ireq->i_len > IEEE80211_MAX_OPT_IE)
return EINVAL;
- /* NB: data.length is validated by the wireless extensions code */
- MALLOC(ie, void *, ireq->i_len, M_DEVBUF, M_WAITOK);
+ MALLOC(ie, void *, ireq->i_len, M_DEVBUF, M_NOWAIT);
if (ie == NULL)
return ENOMEM;
error = copyin(ireq->i_data, ie, ireq->i_len);
OpenPOWER on IntegriCloud