P2P: Do not call wpas_p2p_disconnect_safely() if no match is found

In theory, wpas_p2p_disconnect_safely() could have dereferenced the
wpa_s == NULL argument, but in practice, it won't due to the
calling_wpa_s == wpa_s check and wpas_p2p_disconnect() accepting NULL.
Anyway, it is cleaner to add an explicit check for this. (CID 74492)

Signed-off-by: Jouni Malinen <j@w1.fi>

diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c
index 0e43614443e48f0bf550ab01b2504e985a5f7012..2712bb3d447fceb03dc9c0b97841857e32b7d56b 100644 (file)
--- a/wpa_supplicant/p2p_supplicant.c
+++ b/wpa_supplicant/p2p_supplicant.c
@@ -455,7 +455,7 @@ static void run_wpas_p2p_disconnect(void *eloop_ctx, void *timeout_ctx)
 static int wpas_p2p_disconnect_safely(struct wpa_supplicant *wpa_s,
                                      struct wpa_supplicant *calling_wpa_s)
 {
-       if (calling_wpa_s == wpa_s &&
+       if (calling_wpa_s == wpa_s && wpa_s &&
            wpa_s->p2p_group_interface != NOT_P2P_GROUP_INTERFACE) {
                /*
                 * The calling wpa_s instance is going to be removed. Do that