wpa_supplicant: Update to 07-Jul-2012 TOT
commit a5ed45586c63ffd8f9d2b44e27c251d7bacbeaf4 Author: Jouni Malinen <j@w1.fi> Date: Sat Jul 7 13:01:45 2012 +0300 WPS SSDP: Fix socket leaks on error paths Change-Id: I0864aac7fc88fa2a60f5cca7d524b94363410c85 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
This commit is contained in:
@@ -184,6 +184,7 @@ static void wpa_supplicant_ctrl_iface_receive(int sock, void *eloop_ctx,
|
||||
wpa_s = eloop_ctx;
|
||||
}
|
||||
os_memmove(ifname, ifend, strlen(ifend) + 1);
|
||||
wpa_printf(MSG_DEBUG, "wpa_s %p cmd %s", wpa_s, buf);
|
||||
}
|
||||
#endif /* defined CONFIG_P2P && defined ANDROID_P2P */
|
||||
reply = wpa_supplicant_ctrl_iface_process(wpa_s, buf,
|
||||
@@ -397,7 +398,7 @@ wpa_supplicant_ctrl_iface_init(struct wpa_supplicant *wpa_s)
|
||||
}
|
||||
if (bind(priv->sock, (struct sockaddr *) &addr,
|
||||
sizeof(addr)) < 0) {
|
||||
perror("bind(PF_UNIX)");
|
||||
perror("supp-ctrl-iface-init: bind(PF_UNIX)");
|
||||
goto fail;
|
||||
}
|
||||
wpa_printf(MSG_DEBUG, "Successfully replaced leftover "
|
||||
@@ -689,7 +690,8 @@ wpa_supplicant_global_ctrl_iface_init(struct wpa_global *global)
|
||||
os_strlcpy(addr.sun_path, global->params.ctrl_interface,
|
||||
sizeof(addr.sun_path));
|
||||
if (bind(priv->sock, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
|
||||
perror("bind(PF_UNIX)");
|
||||
perror("supp-global-ctrl-iface-init (will try fixup): "
|
||||
"bind(PF_UNIX)");
|
||||
if (connect(priv->sock, (struct sockaddr *) &addr,
|
||||
sizeof(addr)) < 0) {
|
||||
wpa_printf(MSG_DEBUG, "ctrl_iface exists, but does not"
|
||||
@@ -704,7 +706,7 @@ wpa_supplicant_global_ctrl_iface_init(struct wpa_global *global)
|
||||
}
|
||||
if (bind(priv->sock, (struct sockaddr *) &addr,
|
||||
sizeof(addr)) < 0) {
|
||||
perror("bind(PF_UNIX)");
|
||||
perror("supp-glb-iface-init: bind(PF_UNIX)");
|
||||
goto fail;
|
||||
}
|
||||
wpa_printf(MSG_DEBUG, "Successfully replaced leftover "
|
||||
|
||||
Reference in New Issue
Block a user