aboutsummaryrefslogtreecommitdiffstats
path: root/src/eap_server
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2014-02-18 10:33:49 -0800
committerDmitry Shmidt <dimitrysh@google.com>2014-02-18 10:33:49 -0800
commitbd14a57187b024f49f5b9ace55ef457d8d04650a (patch)
treec9ae1052918a2718d01efc764a9f3577d3e96079 /src/eap_server
parent96be6222df414a7dde5c5b1b72df22e67b1a77fc (diff)
downloadandroid_external_wpa_supplicant_8-bd14a57187b024f49f5b9ace55ef457d8d04650a.tar.gz
android_external_wpa_supplicant_8-bd14a57187b024f49f5b9ace55ef457d8d04650a.tar.bz2
android_external_wpa_supplicant_8-bd14a57187b024f49f5b9ace55ef457d8d04650a.zip
Cumulative patch from commit b3253ebb73d6d52ac636c5cc6d958955a5a98fca
b3253eb wpa_supplicant: Complete radio works on disable event 38ecb06 Convert RADIUS debug dumps to use wpa_printf() a0ac572 EAP-SIM DB: Remove client socket file on connect() error a1dd890 RADIUS: Add minimal accounting server support 22dd2d7 Fix MSCHAP UTF-8 to UCS-2 conversion for three-byte encoding 9aab811 Fix nt_password_hash build a9b08ad Remove unused crypto_bignum_rshift() 2dff9e8 Remove unused NFC_RX_HANDOVER_REQ be24917 nl80211: Use nl80211_set_iface_id() to get hw features data 8a45811 hostapd: Add Operating Mode Notification support d9dd86b Enable IEEE 802.11w in defconfig Change-Id: I6bf13cd0b7e3cb3c3550b87a77a035340e9d0a6b Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'src/eap_server')
-rw-r--r--src/eap_server/eap_sim_db.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/eap_server/eap_sim_db.c b/src/eap_server/eap_sim_db.c
index 45660ed7..bc2cbe5b 100644
--- a/src/eap_server/eap_sim_db.c
+++ b/src/eap_server/eap_sim_db.c
@@ -639,6 +639,11 @@ static int eap_sim_db_open_socket(struct eap_sim_db_data *data)
"/tmp/eap_sim_db_%d-%d", getpid(), counter++);
os_free(data->local_sock);
data->local_sock = os_strdup(addr.sun_path);
+ if (data->local_sock == NULL) {
+ close(data->sock);
+ data->sock = -1;
+ return -1;
+ }
if (bind(data->sock, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
wpa_printf(MSG_INFO, "bind(eap_sim_db): %s", strerror(errno));
close(data->sock);
@@ -657,6 +662,9 @@ static int eap_sim_db_open_socket(struct eap_sim_db_data *data)
os_strlen(addr.sun_path));
close(data->sock);
data->sock = -1;
+ unlink(data->local_sock);
+ os_free(data->local_sock);
+ data->local_sock = NULL;
return -1;
}