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

nl80211: fix wpa supplicant ctrl socket permissions

Browse source 
No data at all can currently be read from the control socket.
Set up the permission exactly like hostapd's wpa_cli utility to fix it.

Among other this fixes a mesh's encryption being shown as "None".

Signed-off-by: Andre Heider <a.heider@gmail.com>
This commit is contained in:
Andre Heider 2022-11-13 21:11:06 +01:00 • committed by Jo-Philipp Wich
parent d6381634c2
commit dd4e1ffeac
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
iwinfo_nl80211.c
View file

@ -938,6 +938,18 @@ static int nl80211_wpactl_connect(const char *ifname, struct sockaddr_un *local)
sprintf(remote.sun_path, "/var/run/wpa_supplicant-%s/%s", sprintf(remote.sun_path, "/var/run/wpa_supplicant-%s/%s",
ifname, ifname); ifname, ifname);
/* Set client socket file permissions so that bind() creates the client
* socket with these permissions and there is no need to try to change
* them with chmod() after bind() which would have potential issues with
* race conditions. These permissions are needed to make sure the server
* side (wpa_supplicant or hostapd) can reply to the control interface
* messages.
*
* The lchown() calls below after bind() are also part of the needed
* operations to allow the response to go through. Those are using the
* no-deference-symlinks version to avoid races. */
fchmod(sock, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
if (fcntl(sock, F_SETFD, fcntl(sock, F_GETFD) | FD_CLOEXEC) < 0) if (fcntl(sock, F_SETFD, fcntl(sock, F_GETFD) | FD_CLOEXEC) < 0)
{ {
close(sock); close(sock);
@ -966,6 +978,10 @@ static int nl80211_wpactl_connect(const char *ifname, struct sockaddr_un *local)
return -1; return -1;
} }
/* Set group even if we do not have privileges to change owner */
lchown(local->sun_path, -1, 101);
lchown(local->sun_path, 101, 101);
return sock; return sock;
} }