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

libnm-core: fix int comparisons in team setting

Browse Source
This commit is contained in:
Thomas Haller
2018-10-07 13:56:25 +02:00
committed by Beniamino Galvani
parent d0f85092b9
commit 72b4541771
2 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libnm-core/nm-setting-team.c
View File

@@ -125,9 +125,9 @@ nm_team_link_watcher_new_ethtool (int delay_up,
NMTeamLinkWatcher *watcher; NMTeamLinkWatcher *watcher;
const char *val_fail = NULL; const char *val_fail = NULL;
if (delay_up < 0 || delay_up > G_MAXINT32) if (delay_up < 0 || !_NM_INT_LE_MAXINT32 (delay_up))
val_fail = "delay-up"; val_fail = "delay-up";
if (delay_down < 0 || delay_down > G_MAXINT32) if (delay_down < 0 || !_NM_INT_LE_MAXINT32 (delay_up))
val_fail = "delay-down"; val_fail = "delay-down";
if (val_fail) { if (val_fail) {
g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED, g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,

29
shared/nm-utils/nm-shared-utils.h
View File

@@ -34,7 +34,7 @@ _NM_INT_NOT_NEGATIVE (gssize val)
* *
* When using such an enum for accessing an array, one naturally wants to check * When using such an enum for accessing an array, one naturally wants to check
* that the enum is not negative. However, the compiler doesn't like a plain * that the enum is not negative. However, the compiler doesn't like a plain
* comparisong "enum_val >= 0", because (if the enum is unsigned), it will warn * comparison "enum_val >= 0", because (if the enum is unsigned), it will warn
* that the expression is always true *duh*. Not even a cast to a signed * that the expression is always true *duh*. Not even a cast to a signed
* type helps to avoid the compiler warning in any case. * type helps to avoid the compiler warning in any case.
* *
@@ -43,6 +43,33 @@ _NM_INT_NOT_NEGATIVE (gssize val)
return val >= 0; return val >= 0;
} }
/* check whether the integer value is smaller than G_MAXINT32. This macro exists
* for the sole purpose, that a plain "((int) value <= G_MAXINT32)" comparison
* may cause the compiler or coverity that this check is always TRUE. But the
* check depends on compile time and the size of C type "int". Of course, most
* of the time in is gint32 and an int value is always <= G_MAXINT32. The check
* exists to catch cases where that is not true.
*
* Together with the G_STATIC_ASSERT(), we make sure that this is always satisfied. */
G_STATIC_ASSERT (sizeof (int) == sizeof (gint32));
#if _NM_CC_SUPPORT_GENERIC
#define _NM_INT_LE_MAXINT32(value) \
({ \
_nm_unused typeof (value) _value = (value); \
\
_Generic((value), \
int: TRUE \
); \
})
#else
#define _NM_INT_LE_MAXINT32(value) ({ \
_nm_unused typeof (value) _value = (value); \
_nm_unused const int *_p_value = &_value; \
\
TRUE; \
})
#endif
/*****************************************************************************/ /*****************************************************************************/
static inline char static inline char