jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

RADIUS client: Fix socket close/re-open on server change

Browse source 
Both IPv4 and IPv6 sockets were not closed consistently in the paths
that tried to change RADIUS servers. This could result in leaking
sockets and leaving behind registered eloop events to freed memory on
interface removal.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2014-05-30 17:21:28 +03:00
parent d045cc8e4c
commit 70d4084885
1 changed files with 48 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
src/radius/radius_client.c
View file

@ -311,8 +311,6 @@ static int radius_client_handle_send_error(struct radius_client_data *radius,
HOSTAPD_LEVEL_INFO, HOSTAPD_LEVEL_INFO,
"Send failed - maybe interface status changed -" "Send failed - maybe interface status changed -"
" try to connect again"); " try to connect again");
eloop_unregister_read_sock(s);
close(s);
if (msg_type == RADIUS_ACCT || if (msg_type == RADIUS_ACCT ||
msg_type == RADIUS_ACCT_INTERIM) { msg_type == RADIUS_ACCT_INTERIM) {
radius_client_init_acct(radius); radius_client_init_acct(radius);
@ -1151,11 +1149,51 @@ static int radius_client_disable_pmtu_discovery(int s)
} }
static void radius_close_auth_sockets(struct radius_client_data *radius)
{
radius->auth_sock = -1;
if (radius->auth_serv_sock >= 0) {
eloop_unregister_read_sock(radius->auth_serv_sock);
close(radius->auth_serv_sock);
radius->auth_serv_sock = -1;
}
#ifdef CONFIG_IPV6
if (radius->auth_serv_sock6 >= 0) {
eloop_unregister_read_sock(radius->auth_serv_sock6);
close(radius->auth_serv_sock6);
radius->auth_serv_sock6 = -1;
}
#endif /* CONFIG_IPV6 */
}
static void radius_close_acct_sockets(struct radius_client_data *radius)
{
radius->acct_sock = -1;
if (radius->acct_serv_sock >= 0) {
eloop_unregister_read_sock(radius->acct_serv_sock);
close(radius->acct_serv_sock);
radius->acct_serv_sock = -1;
}
#ifdef CONFIG_IPV6
if (radius->acct_serv_sock6 >= 0) {
eloop_unregister_read_sock(radius->acct_serv_sock6);
close(radius->acct_serv_sock6);
radius->acct_serv_sock6 = -1;
}
#endif /* CONFIG_IPV6 */
}
static int radius_client_init_auth(struct radius_client_data *radius) static int radius_client_init_auth(struct radius_client_data *radius)
{ {
struct hostapd_radius_servers *conf = radius->conf; struct hostapd_radius_servers *conf = radius->conf;
int ok = 0; int ok = 0;
radius_close_auth_sockets(radius);
radius->auth_serv_sock = socket(PF_INET, SOCK_DGRAM, 0); radius->auth_serv_sock = socket(PF_INET, SOCK_DGRAM, 0);
if (radius->auth_serv_sock < 0) if (radius->auth_serv_sock < 0)
wpa_printf(MSG_INFO, "RADIUS: socket[PF_INET,SOCK_DGRAM]: %s", wpa_printf(MSG_INFO, "RADIUS: socket[PF_INET,SOCK_DGRAM]: %s",
@ -1186,6 +1224,7 @@ static int radius_client_init_auth(struct radius_client_data *radius)
radius_client_receive, radius, radius_client_receive, radius,
(void *) RADIUS_AUTH)) { (void *) RADIUS_AUTH)) {
wpa_printf(MSG_INFO, "RADIUS: Could not register read socket for authentication server"); wpa_printf(MSG_INFO, "RADIUS: Could not register read socket for authentication server");
radius_close_auth_sockets(radius);
return -1; return -1;
} }
@ -1195,6 +1234,7 @@ static int radius_client_init_auth(struct radius_client_data *radius)
radius_client_receive, radius, radius_client_receive, radius,
(void *) RADIUS_AUTH)) { (void *) RADIUS_AUTH)) {
wpa_printf(MSG_INFO, "RADIUS: Could not register read socket for authentication server"); wpa_printf(MSG_INFO, "RADIUS: Could not register read socket for authentication server");
radius_close_auth_sockets(radius);
return -1; return -1;
} }
#endif /* CONFIG_IPV6 */ #endif /* CONFIG_IPV6 */
@ -1208,6 +1248,8 @@ static int radius_client_init_acct(struct radius_client_data *radius)
struct hostapd_radius_servers *conf = radius->conf; struct hostapd_radius_servers *conf = radius->conf;
int ok = 0; int ok = 0;
radius_close_acct_sockets(radius);
radius->acct_serv_sock = socket(PF_INET, SOCK_DGRAM, 0); radius->acct_serv_sock = socket(PF_INET, SOCK_DGRAM, 0);
if (radius->acct_serv_sock < 0) if (radius->acct_serv_sock < 0)
wpa_printf(MSG_INFO, "RADIUS: socket[PF_INET,SOCK_DGRAM]: %s", wpa_printf(MSG_INFO, "RADIUS: socket[PF_INET,SOCK_DGRAM]: %s",
@ -1238,6 +1280,7 @@ static int radius_client_init_acct(struct radius_client_data *radius)
radius_client_receive, radius, radius_client_receive, radius,
(void *) RADIUS_ACCT)) { (void *) RADIUS_ACCT)) {
wpa_printf(MSG_INFO, "RADIUS: Could not register read socket for accounting server"); wpa_printf(MSG_INFO, "RADIUS: Could not register read socket for accounting server");
radius_close_acct_sockets(radius);
return -1; return -1;
} }
@ -1247,6 +1290,7 @@ static int radius_client_init_acct(struct radius_client_data *radius)
radius_client_receive, radius, radius_client_receive, radius,
(void *) RADIUS_ACCT)) { (void *) RADIUS_ACCT)) {
wpa_printf(MSG_INFO, "RADIUS: Could not register read socket for accounting server"); wpa_printf(MSG_INFO, "RADIUS: Could not register read socket for accounting server");
radius_close_acct_sockets(radius);
return -1; return -1;
} }
#endif /* CONFIG_IPV6 */ #endif /* CONFIG_IPV6 */
@ -1308,16 +1352,8 @@ void radius_client_deinit(struct radius_client_data *radius)
if (!radius) if (!radius)
return; return;
if (radius->auth_serv_sock >= 0) radius_close_auth_sockets(radius);
eloop_unregister_read_sock(radius->auth_serv_sock); radius_close_acct_sockets(radius);
if (radius->acct_serv_sock >= 0)
eloop_unregister_read_sock(radius->acct_serv_sock);
#ifdef CONFIG_IPV6
if (radius->auth_serv_sock6 >= 0)
eloop_unregister_read_sock(radius->auth_serv_sock6);
if (radius->acct_serv_sock6 >= 0)
eloop_unregister_read_sock(radius->acct_serv_sock6);
#endif /* CONFIG_IPV6 */
eloop_cancel_timeout(radius_retry_primary_timer, radius, NULL); eloop_cancel_timeout(radius_retry_primary_timer, radius, NULL);