hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-27 19:37:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

wpa: ctrl_iface set sendbuf size

Browse Source 
In order to avoid running into the default net.local.dgram.maxdgram
of 2K currently when calling sendto(2) try to set the sndbuf size to
the maximum ctrl message size.
While on 14 and 15 this does not actually raise the limit anymore (and
be7c095ac9 raised it for syslogd and this),
FreeBSD 13 still requires this change and it will work as expected there.
In addition we always ensure a large enough send buffer this way
independent of kernel defaults.
The problem occured, e.g., when the scan_list result had enough BSSIDs
so the text output would exceed 2048 bytes.

Sponsored by:	The FreeBSD Foundation
MFC after:	3 days
PR:		274990
Reviewed by:	cy, adrian (with previous comment)
Differential Revision: https://reviews.freebsd.org/D42558
This commit is contained in:
Bjoern A. Zeeb 2023-11-12 20:33:41 +00:00
parent f071abd92e
commit 1edc20b769
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
contrib/wpa/wpa_supplicant/ctrl_iface_unix.c
View File

@ -506,6 +506,10 @@ static int wpas_ctrl_iface_open_sock(struct wpa_supplicant *wpa_s,
struct group *grp;
char *endp;
int flags;
#if defined(__FreeBSD__)
int optval, rc;
socklen_t optlen;
#endif
buf = os_strdup(wpa_s->conf->ctrl_interface);
if (buf == NULL)
@ -679,6 +683,22 @@ havesock:
}
}
#if defined(__FreeBSD__)
/* Ensure we can send a full length message atomically. */
optval = 0;
optlen = sizeof(optval);
if (getsockopt(priv->sock, SOL_SOCKET, SO_SNDBUF, &optval, &optlen) == -1) {
wpa_printf(MSG_INFO, "failed to get sndbuf for sock=%d: %s",
priv->sock, strerror(errno));
} else if (optval < CTRL_IFACE_MAX_LEN) {
optval = CTRL_IFACE_MAX_LEN;
if (setsockopt(priv->sock, SOL_SOCKET, SO_SNDBUF, &optval,
sizeof(optval)) == -1)
wpa_printf(MSG_ERROR, "failed to set sndbuf for "
"sock=%d: %s", priv->sock, strerror(errno));
}
#endif
eloop_register_read_sock(priv->sock, wpa_supplicant_ctrl_iface_receive,
wpa_s, priv);
wpa_msg_register_cb(wpa_supplicant_ctrl_iface_msg_cb);