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

platform: fix return value for nm_platform_sysctl_set()

Browse Source 
When comparing an unsigned and a signed integer, the signed integer
is promoted to unsigned, resulting in a very large number.

See the checks "nwrote < len - 1", where nwrote might be -1
to indicate failure. The condition would not be TRUE due to
promoting -1 to the max int value.

Hence, sysctl_set() was rather wrong.
This commit is contained in:
Thomas Haller
2017-10-23 16:59:10 +02:00
parent 5f882e8e8f
commit 8daa61dae3
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2934,7 +2934,7 @@ sysctl_set (NMPlatform *platform, const char *pathid, int dirfd, const char *pat
nm_auto_pop_netns NMPNetns *netns = NULL; nm_auto_pop_netns NMPNetns *netns = NULL;
int fd, tries; int fd, tries;
gssize nwrote; gssize nwrote;
gsize len; gssize len;
char *actual; char *actual;
gs_free char *actual_free = NULL; gs_free char *actual_free = NULL;
int errsv; int errsv;
@@ -2989,6 +2989,7 @@ sysctl_set (NMPlatform *platform, const char *pathid, int dirfd, const char *pat
* about to write. * about to write.
*/ */
len = strlen (value) + 1; len = strlen (value) + 1;
nm_assert (len > 0);
if (len > 512) if (len > 512)
actual = actual_free = g_malloc (len + 1); actual = actual_free = g_malloc (len + 1);
else else