fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 10:38:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

all: use NM_IW_ESSID_MAX_SIZE define instead of literally 32

Browse source
This commit is contained in:
Thomas Haller 2021-03-18 11:34:35 +01:00
parent cd00b04099
commit 008302aa4e
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/devices/wifi/nm-device-wifi.c
View file

@ -1434,7 +1434,7 @@ ssids_options_to_ptrarray(GVariant *value, GError **error)
v = g_variant_get_child_value(value, i); v = g_variant_get_child_value(value, i);
bytes = g_variant_get_fixed_array(v, &len, sizeof(guint8)); bytes = g_variant_get_fixed_array(v, &len, sizeof(guint8));
if (len > 32) { if (len > NM_IW_ESSID_MAX_SIZE) {
g_set_error(error, g_set_error(error,
NM_DEVICE_ERROR, NM_DEVICE_ERROR,
NM_DEVICE_ERROR_INVALID_ARGUMENT, NM_DEVICE_ERROR_INVALID_ARGUMENT,

2
src/core/devices/wifi/nm-wifi-ap.c
View file

@ -98,7 +98,7 @@ nm_wifi_ap_set_ssid(NMWifiAP *ap, GBytes *ssid)
} }
l = g_bytes_get_size(ssid); l = g_bytes_get_size(ssid);
if (l == 0 || l > 32) if (l == 0 || l > NM_IW_ESSID_MAX_SIZE)
g_return_val_if_reached(FALSE); g_return_val_if_reached(FALSE);
priv = NM_WIFI_AP_GET_PRIVATE(ap); priv = NM_WIFI_AP_GET_PRIVATE(ap);

2
src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
View file

@ -4302,7 +4302,7 @@ make_wireless_setting(shvarFile *ifcfg, GError **error)
bytes = g_bytes_new(value, value_len); bytes = g_bytes_new(value, value_len);
ssid_len = g_bytes_get_size(bytes); ssid_len = g_bytes_get_size(bytes);
if (ssid_len > 32 || ssid_len == 0) { if (ssid_len == 0 || ssid_len > NM_IW_ESSID_MAX_SIZE) {
g_set_error(error, g_set_error(error,
NM_SETTINGS_ERROR, NM_SETTINGS_ERROR,
NM_SETTINGS_ERROR_INVALID_CONNECTION, NM_SETTINGS_ERROR_INVALID_CONNECTION,

6
src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
View file

@ -862,7 +862,7 @@ write_wireless_setting(NMConnection *connection,
return FALSE; return FALSE;
} }
ssid_data = g_bytes_get_data(ssid, &ssid_len); ssid_data = g_bytes_get_data(ssid, &ssid_len);
if (!ssid_len || ssid_len > 32) { if (ssid_len == 0 || ssid_len > NM_IW_ESSID_MAX_SIZE) {
g_set_error(error, g_set_error(error,
NM_SETTINGS_ERROR, NM_SETTINGS_ERROR,
NM_SETTINGS_ERROR_FAILED, NM_SETTINGS_ERROR_FAILED,
@ -903,9 +903,9 @@ write_wireless_setting(NMConnection *connection,
svSetValueStr(ifcfg, "ESSID", str->str); svSetValueStr(ifcfg, "ESSID", str->str);
g_string_free(str, TRUE); g_string_free(str, TRUE);
} else { } else {
char buf[33]; char buf[NM_IW_ESSID_MAX_SIZE + 1];
nm_assert(ssid_len <= 32); nm_assert(ssid_len <= NM_IW_ESSID_MAX_SIZE);
memcpy(buf, ssid_data, ssid_len); memcpy(buf, ssid_data, ssid_len);
buf[ssid_len] = '\0'; buf[ssid_len] = '\0';
svSetValueStr(ifcfg, "ESSID", buf); svSetValueStr(ifcfg, "ESSID", buf);