From 44c4504d1549ab0f6dda503050ad5ca2654d0f91 Mon Sep 17 00:00:00 2001 From: krishna T Date: Sun, 19 Feb 2023 01:28:05 +0530 Subject: [PATCH] [nrf noup] Fix control interface socket close We register Socket 1 to Eloop, so, socket 1 should be closed. Fixes SHEL-1872. Signed-off-by: Krishna T --- wpa_supplicant/ctrl_iface_zephyr.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/wpa_supplicant/ctrl_iface_zephyr.c b/wpa_supplicant/ctrl_iface_zephyr.c index 6b902a3dc..07eebf0e6 100644 --- a/wpa_supplicant/ctrl_iface_zephyr.c +++ b/wpa_supplicant/ctrl_iface_zephyr.c @@ -104,14 +104,14 @@ void wpa_supplicant_ctrl_iface_deinit(struct wpa_supplicant *wpa_s, if (!priv) return; - if (priv->sock_pair[0] > -1) { - eloop_unregister_read_sock(priv->sock_pair[0]); - close(priv->sock_pair[0]); - priv->sock_pair[0] = -1; + if (priv->sock_pair[1] > -1) { + eloop_unregister_read_sock(priv->sock_pair[1]); + close(priv->sock_pair[1]); + priv->sock_pair[1] = -1; } - if (priv->sock_pair[1] >= 0) - close(priv->sock_pair[1]); + if (priv->sock_pair[0] >= 0) + close(priv->sock_pair[0]); os_free(priv); } @@ -213,14 +213,14 @@ wpa_supplicant_global_ctrl_iface_deinit(struct ctrl_iface_global_priv *priv) if (!priv) return; - if (priv->sock_pair[0] > -1) { - eloop_unregister_read_sock(priv->sock_pair[0]); - close(priv->sock_pair[0]); - priv->sock_pair[0] = -1; + if (priv->sock_pair[1] > -1) { + eloop_unregister_read_sock(priv->sock_pair[1]); + close(priv->sock_pair[1]); + priv->sock_pair[1] = -1; } - if (priv->sock_pair[1] >= 0) - close(priv->sock_pair[1]); + if (priv->sock_pair[0] >= 0) + close(priv->sock_pair[0]); os_free(priv); }