Handle NULL return from os_zalloc() in sta_track_add()

[mech_eap.git] / src / wps / wps_dev_attr.c

diff --git a/src/wps/wps_dev_attr.c b/src/wps/wps_dev_attr.c
index 559582d..0d01211 100644 (file)
--- a/src/wps/wps_dev_attr.c
+++ b/src/wps/wps_dev_attr.c
@@ -85,8 +85,7 @@ int wps_build_model_number(struct wps_device_data *dev, struct wpabuf *msg)
 }
 
 
-static int wps_build_serial_number(struct wps_device_data *dev,
-                                  struct wpabuf *msg)
+int wps_build_serial_number(struct wps_device_data *dev, struct wpabuf *msg)
 {
        size_t len;
        wpa_printf(MSG_DEBUG, "WPS:  * Serial Number");
@@ -203,16 +202,27 @@ int wps_build_os_version(struct wps_device_data *dev, struct wpabuf *msg)
 }
 
 
-int wps_build_rf_bands(struct wps_device_data *dev, struct wpabuf *msg)
+int wps_build_vendor_ext_m1(struct wps_device_data *dev, struct wpabuf *msg)
 {
-       wpa_printf(MSG_DEBUG, "WPS:  * RF Bands (%x)", dev->rf_bands);
-       wpabuf_put_be16(msg, ATTR_RF_BANDS);
-       wpabuf_put_be16(msg, 1);
-       wpabuf_put_u8(msg, dev->rf_bands);
+       if (dev->vendor_ext_m1 != NULL) {
+               wpa_hexdump(MSG_DEBUG, "WPS:  * Vendor Extension M1",
+                           wpabuf_head_u8(dev->vendor_ext_m1),
+                           wpabuf_len(dev->vendor_ext_m1));
+               wpabuf_put_be16(msg, ATTR_VENDOR_EXT);
+               wpabuf_put_be16(msg, wpabuf_len(dev->vendor_ext_m1));
+               wpabuf_put_buf(msg, dev->vendor_ext_m1);
+       }
        return 0;
 }
 
 
+int wps_build_rf_bands(struct wps_device_data *dev, struct wpabuf *msg,
+                      u8 rf_band)
+{
+       return wps_build_rf_bands_attr(msg, rf_band ? rf_band : dev->rf_bands);
+}
+
+
 int wps_build_vendor_ext(struct wps_device_data *dev, struct wpabuf *msg)
 {
        int i;
@@ -243,11 +253,9 @@ static int wps_process_manufacturer(struct wps_device_data *dev, const u8 *str,
        wpa_hexdump_ascii(MSG_DEBUG, "WPS: Manufacturer", str, str_len);
 
        os_free(dev->manufacturer);
-       dev->manufacturer = os_malloc(str_len + 1);
+       dev->manufacturer = dup_binstr(str, str_len);
        if (dev->manufacturer == NULL)
                return -1;
-       os_memcpy(dev->manufacturer, str, str_len);
-       dev->manufacturer[str_len] = '\0';
 
        return 0;
 }
@@ -264,11 +272,9 @@ static int wps_process_model_name(struct wps_device_data *dev, const u8 *str,
        wpa_hexdump_ascii(MSG_DEBUG, "WPS: Model Name", str, str_len);
 
        os_free(dev->model_name);
-       dev->model_name = os_malloc(str_len + 1);
+       dev->model_name = dup_binstr(str, str_len);
        if (dev->model_name == NULL)
                return -1;
-       os_memcpy(dev->model_name, str, str_len);
-       dev->model_name[str_len] = '\0';
 
        return 0;
 }
@@ -285,11 +291,9 @@ static int wps_process_model_number(struct wps_device_data *dev, const u8 *str,
        wpa_hexdump_ascii(MSG_DEBUG, "WPS: Model Number", str, str_len);
 
        os_free(dev->model_number);
-       dev->model_number = os_malloc(str_len + 1);
+       dev->model_number = dup_binstr(str, str_len);
        if (dev->model_number == NULL)
                return -1;
-       os_memcpy(dev->model_number, str, str_len);
-       dev->model_number[str_len] = '\0';
 
        return 0;
 }
@@ -306,11 +310,9 @@ static int wps_process_serial_number(struct wps_device_data *dev,
        wpa_hexdump_ascii(MSG_DEBUG, "WPS: Serial Number", str, str_len);
 
        os_free(dev->serial_number);
-       dev->serial_number = os_malloc(str_len + 1);
+       dev->serial_number = dup_binstr(str, str_len);
        if (dev->serial_number == NULL)
                return -1;
-       os_memcpy(dev->serial_number, str, str_len);
-       dev->serial_number[str_len] = '\0';
 
        return 0;
 }
@@ -327,11 +329,9 @@ static int wps_process_dev_name(struct wps_device_data *dev, const u8 *str,
        wpa_hexdump_ascii(MSG_DEBUG, "WPS: Device Name", str, str_len);
 
        os_free(dev->device_name);
-       dev->device_name = os_malloc(str_len + 1);
+       dev->device_name = dup_binstr(str, str_len);
        if (dev->device_name == NULL)
                return -1;
-       os_memcpy(dev->device_name, str, str_len);
-       dev->device_name[str_len] = '\0';
 
        return 0;
 }
@@ -404,25 +404,6 @@ int wps_process_rf_bands(struct wps_device_data *dev, const u8 *bands)
 }
 
 
-void wps_device_data_dup(struct wps_device_data *dst,
-                        const struct wps_device_data *src)
-{
-       if (src->device_name)
-               dst->device_name = os_strdup(src->device_name);
-       if (src->manufacturer)
-               dst->manufacturer = os_strdup(src->manufacturer);
-       if (src->model_name)
-               dst->model_name = os_strdup(src->model_name);
-       if (src->model_number)
-               dst->model_number = os_strdup(src->model_number);
-       if (src->serial_number)
-               dst->serial_number = os_strdup(src->serial_number);
-       os_memcpy(dst->pri_dev_type, src->pri_dev_type, WPS_DEV_TYPE_LEN);
-       dst->os_version = src->os_version;
-       dst->rf_bands = src->rf_bands;
-}
-
-
 void wps_device_data_free(struct wps_device_data *dev)
 {
        os_free(dev->device_name);