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

wpa_supplicant: Use unique IDs for networks and credentials

Browse source 
The id and cred_id variables are reset to 0 every time the
wpa_config_read() function is called, which is fine as long as it is
only called once. However, this is not the case when using both the -c
and -I options to specify two config files.

This is a problem because the GUI, since commit eadfeb0e93 ("wpa_gui:
Show entire list of networks"), relies on the network IDs being unique
(and increasing), and might get into an infinite loop otherwise.

This is solved by simply making the variables static.

Signed-off-by: Naïm Favier <n@monade.li>
This commit is contained in:
Naïm Favier 2022-02-07 21:01:39 +01:00 committed by Jouni Malinen
parent dacb6d278d
commit 0adc67612d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
wpa_supplicant/config_file.c
View file

@ -297,8 +297,8 @@ struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp)
struct wpa_ssid *ssid, *tail, *head; struct wpa_ssid *ssid, *tail, *head;
struct wpa_cred *cred, *cred_tail, *cred_head; struct wpa_cred *cred, *cred_tail, *cred_head;
struct wpa_config *config; struct wpa_config *config;
int id = 0; static int id = 0;
int cred_id = 0; static int cred_id = 0;
if (name == NULL) if (name == NULL)
return NULL; return NULL;