DGNum/iwinfo
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

iwinfo: improve center channel handling

Browse source 
- Improve iwinfo center channel struct position
- Prevent read beyond buffer on malformed data

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
This commit is contained in:
Ansuel Smith 2021-01-06 04:05:37 +01:00 committed by Daniel Golle
parent 618c1e86f0
commit 0702f32294
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/iwinfo.h
View file

@ -255,6 +255,8 @@ struct iwinfo_ops {
int (*probe)(const char *ifname); int (*probe)(const char *ifname);
int (*mode)(const char *, int *); int (*mode)(const char *, int *);
int (*channel)(const char *, int *); int (*channel)(const char *, int *);
int (*center_chan1)(const char *, int *);
int (*center_chan2)(const char *, int *);
int (*frequency)(const char *, int *); int (*frequency)(const char *, int *);
int (*frequency_offset)(const char *, int *); int (*frequency_offset)(const char *, int *);
int (*txpower)(const char *, int *); int (*txpower)(const char *, int *);
@ -283,8 +285,6 @@ struct iwinfo_ops {
int (*survey)(const char *, char *, int *); int (*survey)(const char *, char *, int *);
int (*lookup_phy)(const char *, char *); int (*lookup_phy)(const char *, char *);
void (*close)(void); void (*close)(void);
int (*center_chan1)(const char *, int *);
int (*center_chan2)(const char *, int *);
}; };
const char * iwinfo_type(const char *ifname); const char * iwinfo_type(const char *ifname);

22
iwinfo_nl80211.c
View file

@ -2380,14 +2380,18 @@ static void nl80211_get_scanlist_ie(struct nlattr **bss,
IWINFO_CIPHER_TKIP, IWINFO_KMGMT_PSK); IWINFO_CIPHER_TKIP, IWINFO_KMGMT_PSK);
break; break;
case 61: /* HT oeration */ case 61: /* HT oeration */
e->ht_chan_info.primary_chan = ie[2]; if (ie[1] >= 3) {
e->ht_chan_info.secondary_chan_off = ie[3] & 0x3; e->ht_chan_info.primary_chan = ie[2];
e->ht_chan_info.chan_width = (ie[4] & 0x4)>>2; e->ht_chan_info.secondary_chan_off = ie[3] & 0x3;
e->ht_chan_info.chan_width = (ie[4] & 0x4)>>2;
}
break; break;
case 192: /* VHT operation */ case 192: /* VHT operation */
e->vht_chan_info.chan_width = ie[2]; if (ie[1] >= 3) {
e->vht_chan_info.center_chan_1 = ie[3]; e->vht_chan_info.chan_width = ie[2];
e->vht_chan_info.center_chan_2 = ie[4]; e->vht_chan_info.center_chan_1 = ie[3];
e->vht_chan_info.center_chan_2 = ie[4];
}
break; break;
} }
@ -3347,6 +3351,8 @@ const struct iwinfo_ops nl80211_ops = {
.name = "nl80211", .name = "nl80211",
.probe = nl80211_probe, .probe = nl80211_probe,
.channel = nl80211_get_channel, .channel = nl80211_get_channel,
.center_chan1 = nl80211_get_center_chan1,
.center_chan2 = nl80211_get_center_chan2,
.frequency = nl80211_get_frequency, .frequency = nl80211_get_frequency,
.frequency_offset = nl80211_get_frequency_offset, .frequency_offset = nl80211_get_frequency_offset,
.txpower = nl80211_get_txpower, .txpower = nl80211_get_txpower,
@ -3375,7 +3381,5 @@ const struct iwinfo_ops nl80211_ops = {
.countrylist = nl80211_get_countrylist, .countrylist = nl80211_get_countrylist,
.survey = nl80211_get_survey, .survey = nl80211_get_survey,
.lookup_phy = nl80211_lookup_phyname, .lookup_phy = nl80211_lookup_phyname,
.close = nl80211_close, .close = nl80211_close
.center_chan1 = nl80211_get_center_chan1,
.center_chan2 = nl80211_get_center_chan2
}; };