fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-25 00:10:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

initrd: silently ignore invalid "ethernet.s390-options"

Browse source
This commit is contained in:
Thomas Haller 2021-03-15 20:36:06 +01:00
parent e25c458b6f
commit 74a4ee16f5
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/nm-initrd-generator/nmi-cmdline-reader.c
View file

@ -978,7 +978,13 @@ reader_parse_rd_znet(Reader *reader, char *argument, gboolean net_ifnames)
key = g_strndup(tmp, val - tmp);
val[0] = '\0';
val++;
nm_setting_wired_add_s390_option(s_wired, key, val);
if (!_nm_setting_wired_is_valid_s390_option(key)
|| !_nm_setting_wired_is_valid_s390_option_value(val)) {
/* Invalid setting. Silently ignore, but also ensure we
* didn't already set it. */
nm_setting_wired_remove_s390_option(s_wired, key);
} else
nm_setting_wired_add_s390_option(s_wired, key, val);
}
}
}