d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treat setting the optional ie to a zero-length datum to mean "delete

Browse Source 
the ie"; this helps drivers that (wrongly) check ic_opt_ie against NULL
when making decisions

Reviewed by:	luigi, avatar
MFC after:	3 days
This commit is contained in:
sam 2006-02-20 17:17:00 +00:00
parent b365fc827b
commit 076fb6f25e
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sys/net80211/ieee80211_ioctl.c
View File

@ -1655,7 +1655,7 @@ static int
ieee80211_ioctl_setoptie(struct ieee80211com *ic, struct ieee80211req *ireq)
{
int error;
void *ie;
void *ie, *oie;
/*
* NB: Doing this for ap operation could be useful (e.g. for
@ -1667,15 +1667,25 @@ ieee80211_ioctl_setoptie(struct ieee80211com *ic, struct ieee80211req *ireq)
return EINVAL;
if (ireq->i_len > IEEE80211_MAX_OPT_IE)
return EINVAL;
MALLOC(ie, void *, ireq->i_len, M_DEVBUF, M_NOWAIT);
if (ie == NULL)
return ENOMEM;
error = copyin(ireq->i_data, ie, ireq->i_len);
if (ireq->i_len > 0) {
MALLOC(ie, void *, ireq->i_len, M_DEVBUF, M_NOWAIT);
if (ie == NULL)
return ENOMEM;
error = copyin(ireq->i_data, ie, ireq->i_len);
if (error) {
FREE(ie, M_DEVBUF);
return error;
}
} else {
ie = NULL;
ireq->i_len = 0;
}
/* XXX sanity check data? */
if (ic->ic_opt_ie != NULL)
FREE(ic->ic_opt_ie, M_DEVBUF);
oie = ic->ic_opt_ie;
ic->ic_opt_ie = ie;
ic->ic_opt_ie_len = ireq->i_len;
if (oie != NULL)
FREE(oie, M_DEVBUF);
return 0;
}