diff -Nru wpa-2.6/debian/changelog wpa-2.6/debian/changelog --- wpa-2.6/debian/changelog 2019-09-17 13:45:06.000000000 +0200 +++ wpa-2.6/debian/changelog 2020-10-10 13:34:35.000000000 +0200 @@ -1,3 +1,10 @@ +wpa (2:2.6-15ubuntu2.6) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix dbus GetAll request to interface properties + + -- Michael Trimarchi Sat, 10 Oct 2020 13:34:35 +0200 + wpa (2:2.6-15ubuntu2.5) bionic-security; urgency=medium * SECURITY UPDATE: Incorrect indication of disconnection in certain diff -Nru wpa-2.6/debian/patches/fix-dbus-getall-request.patch wpa-2.6/debian/patches/fix-dbus-getall-request.patch --- wpa-2.6/debian/patches/fix-dbus-getall-request.patch 1970-01-01 01:00:00.000000000 +0100 +++ wpa-2.6/debian/patches/fix-dbus-getall-request.patch 2020-10-10 13:34:35.000000000 +0200 @@ -0,0 +1,49 @@ +Index: wpa-2.6/wpa_supplicant/dbus/dbus_new_handlers.c +=================================================================== +--- wpa-2.6.orig/wpa_supplicant/dbus/dbus_new_handlers.c ++++ wpa-2.6/wpa_supplicant/dbus/dbus_new_handlers.c +@@ -3681,25 +3681,26 @@ dbus_bool_t wpas_dbus_getter_stas( + DBusMessageIter *iter, DBusError *error, void *user_data) + { + struct wpa_supplicant *wpa_s = user_data; +- struct hostapd_data *hapd; +- struct sta_info *sta; ++ struct sta_info *sta = NULL; + char **paths = NULL; +- unsigned int i = 0; ++ unsigned int i = 0, num = 0; + dbus_bool_t success = FALSE; + +- if (wpa_s->ap_iface == NULL) +- goto out; +- +- hapd = wpa_s->ap_iface->bss[0]; ++ if (wpa_s->ap_iface) { ++ struct hostapd_data *hapd; ++ hapd = wpa_s->ap_iface->bss[0]; ++ sta = hapd->sta_list; ++ num = hapd->num_sta; ++ } + +- paths = os_calloc(hapd->num_sta, sizeof(char *)); ++ paths = os_calloc(num, sizeof(char *)); + if (!paths) { + dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory"); + return FALSE; + } + + /* Loop through scan results and append each result's object path */ +- for (sta = hapd->sta_list; sta; sta = sta->next) { ++ for (; sta; sta = sta->next) { + paths[i] = os_zalloc(WPAS_DBUS_OBJECT_PATH_MAX); + if (paths[i] == NULL) { + dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, +@@ -3714,7 +3715,7 @@ dbus_bool_t wpas_dbus_getter_stas( + + success = wpas_dbus_simple_array_property_getter(iter, + DBUS_TYPE_OBJECT_PATH, +- paths, hapd->num_sta, ++ paths, num, + error); + + out: diff -Nru wpa-2.6/debian/patches/series wpa-2.6/debian/patches/series --- wpa-2.6/debian/patches/series 2019-09-17 13:44:30.000000000 +0200 +++ wpa-2.6/debian/patches/series 2020-10-10 13:34:35.000000000 +0200 @@ -52,3 +52,4 @@ CVE-2019-13377-pre6.patch CVE-2019-13377-6.patch CVE-2019-16275.patch +fix-dbus-getall-request.patch