colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: fix NMDevice.ip6_use_tempaddr to avoid buffer overrun for zero char in config file

Browse Source 
Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller
2013-12-13 20:12:57 +01:00
parent 1f71972998
commit bb9deec9ef
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/devices/nm-device.c
View File

@@ -3432,7 +3432,6 @@ static int
ip6_use_tempaddr (void) ip6_use_tempaddr (void)
{ {
char *contents = NULL; char *contents = NULL;
gsize len = 0;
const char *group_name = "[forged_group]\n"; const char *group_name = "[forged_group]\n";
char *sysctl_data = NULL; char *sysctl_data = NULL;
GKeyFile *keyfile; GKeyFile *keyfile;
@@ -3440,15 +3439,15 @@ ip6_use_tempaddr (void)
int tmp, ret = -1; int tmp, ret = -1;
/* Read file contents to a string. */ /* Read file contents to a string. */
if (!g_file_get_contents ("/etc/sysctl.conf", &contents, &len, NULL)) if (!g_file_get_contents ("/etc/sysctl.conf", &contents, NULL, NULL))
if (!g_file_get_contents ("/lib/sysctl.d/sysctl.conf", &contents, &len, NULL)) if (!g_file_get_contents ("/lib/sysctl.d/sysctl.conf", &contents, NULL, NULL))
return -1; return -1;
/* Prepend a group so that we can use GKeyFile parser. */ /* Prepend a group so that we can use GKeyFile parser. */
sysctl_data = g_strdup_printf ("%s%s", group_name, contents); sysctl_data = g_strdup_printf ("%s%s", group_name, contents);
keyfile = g_key_file_new (); keyfile = g_key_file_new ();
if (!g_key_file_load_from_data (keyfile, sysctl_data, len + strlen (group_name), G_KEY_FILE_NONE, NULL)) if (!g_key_file_load_from_data (keyfile, sysctl_data, -1, G_KEY_FILE_NONE, NULL))
goto done; goto done;
tmp = g_key_file_get_integer (keyfile, "forged_group", "net.ipv6.conf.default.use_tempaddr", &error); tmp = g_key_file_get_integer (keyfile, "forged_group", "net.ipv6.conf.default.use_tempaddr", &error);