Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libiwinfo: fix two segfaults in nl80211 backend

Browse source
This commit is contained in:
Jo-Philipp Wich 2010-10-12 01:49:20 +00:00
parent bbcaef2c6c
commit 7c8824f0fa
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
contrib/package/iwinfo/src/iwinfo_nl80211.c
View file

@ -136,6 +136,12 @@ static void nl80211_free(struct nl80211_msg_conveyor *cv)
if( cv && cv->msg ) if( cv && cv->msg )
nlmsg_free(cv->msg); nlmsg_free(cv->msg);
if( cv )
{
cv->cb = NULL;
cv->msg = NULL;
}
} }
static struct nl80211_msg_conveyor * nl80211_msg(const char *ifname, int cmd, int flags) static struct nl80211_msg_conveyor * nl80211_msg(const char *ifname, int cmd, int flags)
@ -578,6 +584,7 @@ int nl80211_get_signal(const char *ifname, int *buf)
int nl80211_get_noise(const char *ifname, int *buf) int nl80211_get_noise(const char *ifname, int *buf)
{ {
int rv = -1;
struct nl80211_msg_conveyor *req, *res; struct nl80211_msg_conveyor *req, *res;
struct nlattr *si[NL80211_SURVEY_INFO_MAX + 1]; struct nlattr *si[NL80211_SURVEY_INFO_MAX + 1];
@ -595,10 +602,11 @@ int nl80211_get_noise(const char *ifname, int *buf)
if( res->attr[NL80211_ATTR_SURVEY_INFO] ) if( res->attr[NL80211_ATTR_SURVEY_INFO] )
{ {
if( !nla_parse_nested(si, NL80211_SURVEY_INFO_MAX, if( !nla_parse_nested(si, NL80211_SURVEY_INFO_MAX,
res->attr[NL80211_ATTR_SURVEY_INFO], sp) ) res->attr[NL80211_ATTR_SURVEY_INFO], sp) &&
si[NL80211_SURVEY_INFO_NOISE] )
{ {
*buf = (int8_t)nla_get_u8(si[NL80211_SURVEY_INFO_NOISE]); *buf = (int8_t)nla_get_u8(si[NL80211_SURVEY_INFO_NOISE]);
return 0; rv = 0;
} }
} }
nl80211_free(res); nl80211_free(res);
@ -606,7 +614,7 @@ int nl80211_get_noise(const char *ifname, int *buf)
nl80211_free(req); nl80211_free(req);
} }
return -1; return rv;
} }
int nl80211_get_quality(const char *ifname, int *buf) int nl80211_get_quality(const char *ifname, int *buf)