fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-04-23 20:20:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

ifcfg-rh: do not un-escape value in TEAM_CONFIG, TEAM_PORT_CONFIG

Browse source 
Doing so may cause NetworkManager to run into an very intensive loop in
svUnescape() in shvar.c.

This is 'top' output for very long (invalid team config) - 9309865 bytes long:
  PID USER      PR  NI  VIRT  RES  SHR S %CPU %MEM    TIME+  COMMAND
26855 root      20   0  305m  35m 6092 R 99.8  0.9   8:08.11 NetworkManager

and still not finished.
This commit is contained in:
Jiří Klimeš 2013-11-11 17:35:07 +01:00
parent 6107a94099
commit 4f3a9cca6f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/settings/plugins/ifcfg-rh/reader.c
View file

@ -4193,7 +4193,7 @@ make_team_setting (shvarFile *ifcfg,
s_team = NM_SETTING_TEAM (nm_setting_team_new ());
value = svGetValue (ifcfg, "DEVICE", FALSE);
value = svGetValue (ifcfg, "DEVICE", TRUE);
if (!value || !strlen (value)) {
g_set_error (error, IFCFG_PLUGIN_ERROR, 0, "mandatory DEVICE keyword missing");
goto error;
@ -4202,7 +4202,7 @@ make_team_setting (shvarFile *ifcfg,
g_object_set (s_team, NM_SETTING_TEAM_INTERFACE_NAME, value, NULL);
g_free (value);
value = svGetValue (ifcfg, "TEAM_CONFIG", FALSE);
value = svGetValue (ifcfg, "TEAM_CONFIG", TRUE);
if (value) {
g_object_set (s_team, NM_SETTING_TEAM_CONFIG, value, NULL);
g_free (value);
@ -4496,7 +4496,7 @@ make_team_port_setting (shvarFile *ifcfg)
NMSetting *s_port = NULL;
char *value;
value = svGetValue (ifcfg, "TEAM_PORT_CONFIG", FALSE);
value = svGetValue (ifcfg, "TEAM_PORT_CONFIG", TRUE);
if (value) {
s_port = nm_setting_team_port_new ();
g_object_set (s_port, NM_SETTING_TEAM_PORT_CONFIG, value, NULL);