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

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>

diff --git a/src/radius/radius_client.c b/src/radius/radius_client.c
index 0f00a65c821a4d9217133c41ffd15fc5ba9dc2b2..e876e8f3bc93e8e30bea7ff6c9fb3d6fd1b5e950 100644 (file)
--- a/src/radius/radius_client.c
+++ b/src/radius/radius_client.c
@@ -311,8 +311,6 @@ static int radius_client_handle_send_error(struct radius_client_data *radius,
                               HOSTAPD_LEVEL_INFO,
                               "Send failed - maybe interface status changed -"
                               " try to connect again");
-               eloop_unregister_read_sock(s);
-               close(s);
                if (msg_type == RADIUS_ACCT ||
                    msg_type == RADIUS_ACCT_INTERIM) {
                        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)
 {
        struct hostapd_radius_servers *conf = radius->conf;
        int ok = 0;
 
+       radius_close_auth_sockets(radius);
+
        radius->auth_serv_sock = socket(PF_INET, SOCK_DGRAM, 0);
        if (radius->auth_serv_sock < 0)
                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,
                                     (void *) RADIUS_AUTH)) {
                wpa_printf(MSG_INFO, "RADIUS: Could not register read socket for authentication server");
+               radius_close_auth_sockets(radius);
                return -1;
        }
 
@@ -1195,6 +1234,7 @@ static int radius_client_init_auth(struct radius_client_data *radius)
                                     radius_client_receive, radius,
                                     (void *) RADIUS_AUTH)) {
                wpa_printf(MSG_INFO, "RADIUS: Could not register read socket for authentication server");
+               radius_close_auth_sockets(radius);
                return -1;
        }
 #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;
        int ok = 0;
 
+       radius_close_acct_sockets(radius);
+
        radius->acct_serv_sock = socket(PF_INET, SOCK_DGRAM, 0);
        if (radius->acct_serv_sock < 0)
                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,
                                     (void *) RADIUS_ACCT)) {
                wpa_printf(MSG_INFO, "RADIUS: Could not register read socket for accounting server");
+               radius_close_acct_sockets(radius);
                return -1;
        }
 
@@ -1247,6 +1290,7 @@ static int radius_client_init_acct(struct radius_client_data *radius)
                                     radius_client_receive, radius,
                                     (void *) RADIUS_ACCT)) {
                wpa_printf(MSG_INFO, "RADIUS: Could not register read socket for accounting server");
+               radius_close_acct_sockets(radius);
                return -1;
        }
 #endif /* CONFIG_IPV6 */
@@ -1308,16 +1352,8 @@ void radius_client_deinit(struct radius_client_data *radius)
        if (!radius)
                return;
 
-       if (radius->auth_serv_sock >= 0)
-               eloop_unregister_read_sock(radius->auth_serv_sock);
-       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 */
+       radius_close_auth_sockets(radius);
+       radius_close_acct_sockets(radius);
 
        eloop_cancel_timeout(radius_retry_primary_timer, radius, NULL);