fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-27 14:00:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

wifi: fix find_freq() implementation

Browse source 
As we iterate over "self->num_freqs", we must not modify "freqs",
otherwise, the second and subsequenty frequencies in self->freqs[i]
cannot match.

Fixes: dd8c546ff0 ('2007-12-27  Dan Williams  <dcbw@redhat.com>')
Fixes: ba8527ca58 ('wifi: preliminary nl80211 patch')
(cherry picked from commit 4f9f0587d5)
This commit is contained in:
Thomas Haller 2022-02-15 10:23:19 +01:00
parent 64c8bc24d6
commit 05766ad577
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libnm-platform/wifi/nm-wifi-utils-nl80211.c
View file

@ -382,12 +382,12 @@ wifi_nl80211_find_freq(NMWifiUtils *data, const guint32 *freqs)
{
NMWifiUtilsNl80211 *self = (NMWifiUtilsNl80211 *) data;
int i;
int j;
for (i = 0; i < self->num_freqs; i++) {
while (*freqs) {
if (self->freqs[i] == *freqs)
return *freqs;
freqs++;
for (j = 0; freqs[j] != 0; j++) {
if (self->freqs[i] == freqs[j])
return freqs[j];
}
}
return 0;

10
src/libnm-platform/wifi/nm-wifi-utils-wext.c
View file

@ -252,13 +252,13 @@ static guint32
wifi_wext_find_freq(NMWifiUtils *data, const guint32 *freqs)
{
NMWifiUtilsWext *wext = (NMWifiUtilsWext *) data;
int i;
guint i;
guint j;
for (i = 0; i < wext->num_freqs; i++) {
while (*freqs) {
if (wext->freqs[i] == *freqs)
return *freqs;
freqs++;
for (j = 0; freqs[j] != 0; j++) {
if (wext->freqs[i] == freqs[j])
return freqs[j];
}
}
return 0;