diff --git a/components/wpa_supplicant/src/wps/wps_attr_parse.c b/components/wpa_supplicant/src/wps/wps_attr_parse.c
index a8cf76683d..59f85d709d 100644
--- a/components/wpa_supplicant/src/wps/wps_attr_parse.c
+++ b/components/wpa_supplicant/src/wps/wps_attr_parse.c
@@ -128,10 +128,42 @@ static int wps_parse_vendor_ext(struct wps_parse_attr *attr, const u8 *pos,
 	return 0;
 }
 
+static u16 wps_ignore_null_padding_in_attr(const u8 *pos, u16 type, u16 attr_data_len)
+{
+	u16 len = attr_data_len;
+
+	if (len == 0)
+		return 0;
+	/*
+	 * Some AP's keep NULL-padding at the end of some variable length WPS Attributes.
+	 * This is not as par the WPS2.0 specs, but to avoid interop issues, ignore the
+	 * padding by reducing the attribute length by 1.
+	 */
+	switch (type) {
+		case ATTR_MANUFACTURER:
+		case ATTR_MODEL_NAME:
+		case ATTR_MODEL_NUMBER:
+		case ATTR_SERIAL_NUMBER:
+		case ATTR_DEV_NAME:
+		case ATTR_SSID:
+		case ATTR_NETWORK_KEY:
+			if (pos[len - 1] == 0)
+				len--;
+			break;
+		default:
+			break;
+	}
+
+	return len;
+}
 
 static int wps_set_attr(struct wps_parse_attr *attr, u16 type,
-			const u8 *pos, u16 len)
+			const u8 *pos, u16 attr_data_len)
 {
+	u16 len;
+
+	len = wps_ignore_null_padding_in_attr(pos, type, attr_data_len);
+
 	switch (type) {
 	case ATTR_VERSION:
 		if (len != 1) {
@@ -637,4 +669,4 @@ int wps_parse_msg(const struct wpabuf *msg, struct wps_parse_attr *attr)
 	}
 
 	return 0;
-}
\ No newline at end of file
+}