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

platform: stack-allocate temporary string in _linktype_read_devtype()

Browse Source 
And while at it, don't pass the sysfs_path but instead the ifname to it.
This commit is contained in:
Thomas Haller
2016-04-21 11:10:13 +02:00
parent c486c38962
commit aa509fd8fe
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/platform/nm-linux-platform.c
View File

@@ -593,12 +593,17 @@ _lookup_cached_link (const NMPCache *cache, int ifindex, gboolean *completed_fro
#define DEVTYPE_PREFIX "DEVTYPE=" #define DEVTYPE_PREFIX "DEVTYPE="
static char * static char *
_linktype_read_devtype (const char *sysfs_path) _linktype_read_devtype (const char *ifname)
{ {
gs_free char *uevent = g_strdup_printf ("%s/uevent", sysfs_path); char uevent[NM_STRLEN ("/sys/class/net/123456789012345/uevent\0") + 100 /*safety*/];
char *contents = NULL; char *contents = NULL;
char *cont, *end; char *cont, *end;
nm_sprintf_buf (uevent,
"/sys/class/net/%s/uevent",
NM_ASSERT_VALID_PATH_COMPONENT (ifname));
nm_assert (strlen (uevent) < sizeof (uevent) - 1);
if (!g_file_get_contents (uevent, &contents, NULL, NULL)) if (!g_file_get_contents (uevent, &contents, NULL, NULL))
return NULL; return NULL;
for (cont = contents; cont; cont = end) { for (cont = contents; cont; cont = end) {
@@ -716,7 +721,7 @@ _linktype_get_type (NMPlatform *platform,
if (g_file_test (anycast_mask, G_FILE_TEST_EXISTS)) if (g_file_test (anycast_mask, G_FILE_TEST_EXISTS))
return NM_LINK_TYPE_OLPC_MESH; return NM_LINK_TYPE_OLPC_MESH;
devtype = _linktype_read_devtype (sysfs_path); devtype = _linktype_read_devtype (ifname);
for (i = 0; devtype && i < G_N_ELEMENTS (linktypes); i++) { for (i = 0; devtype && i < G_N_ELEMENTS (linktypes); i++) {
if (g_strcmp0 (devtype, linktypes[i].devtype) == 0) { if (g_strcmp0 (devtype, linktypes[i].devtype) == 0) {
if (linktypes[i].nm_type == NM_LINK_TYPE_BNEP) { if (linktypes[i].nm_type == NM_LINK_TYPE_BNEP) {