WPS: Fixed hostapd to use allocated buffers for device attributes

Previous version did not handle re-configuration correctly since WPS
context data was pointing to old (now freed) strings.

diff --git a/hostapd/wps_hostapd.c b/hostapd/wps_hostapd.c
index 28eec4a580c4d0a44e1019164b6bd6c1feff6782..76258eec0a42939c779d87dbe48cdceda52ddeaf 100644 (file)
--- a/hostapd/wps_hostapd.c
+++ b/hostapd/wps_hostapd.c
@@ -388,11 +388,11 @@ int hostapd_init_wps(struct hostapd_data *hapd,
        os_memcpy(wps->ssid, hapd->conf->ssid.ssid, wps->ssid_len);
        wps->ap = 1;
        os_memcpy(wps->dev.mac_addr, hapd->own_addr, ETH_ALEN);
-       wps->dev.device_name = hapd->conf->device_name;
-       wps->dev.manufacturer = hapd->conf->manufacturer;
-       wps->dev.model_name = hapd->conf->model_name;
-       wps->dev.model_number = hapd->conf->model_number;
-       wps->dev.serial_number = hapd->conf->serial_number;
+       wps->dev.device_name = os_strdup(hapd->conf->device_name);
+       wps->dev.manufacturer = os_strdup(hapd->conf->manufacturer);
+       wps->dev.model_name = os_strdup(hapd->conf->model_name);
+       wps->dev.model_number = os_strdup(hapd->conf->model_number);
+       wps->dev.serial_number = os_strdup(hapd->conf->serial_number);
        if (hapd->conf->config_methods) {
                char *m = hapd->conf->config_methods;
                if (os_strstr(m, "label"))
@@ -532,6 +532,7 @@ void hostapd_deinit_wps(struct hostapd_data *hapd)
                return;
        wps_registrar_deinit(hapd->wps->registrar);
        os_free(hapd->wps->network_key);
+       wps_device_data_free(&hapd->wps->dev);
        os_free(hapd->wps);
        hapd->wps = NULL;
        hostapd_wps_clear_ies(hapd);