fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-27 23:20:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: assert nm_utils_ip4_prefix_to_netmask() for valid IPv4 prefix length

Browse source 
There was already an nm_assert() assertion. Upgrade this
to a g_return_val_if_fail(). This function is public API,
so this is potentially an API break. But it should highlight
a bug in the caller.
This commit is contained in:
Thomas Haller 2022-06-23 07:35:13 +02:00
parent c48a312fc7
commit 7a33870bf1
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/libnm-core-impl/nm-utils.c
View file

@ -1558,7 +1558,13 @@ nm_utils_ip4_routes_from_variant(GVariant *value)
/**
* nm_utils_ip4_netmask_to_prefix:
* @netmask: an IPv4 netmask in network byte order
* @netmask: an IPv4 netmask in network byte order.
* Usually the netmask has all leading bits up to the prefix
* set so that the netmask is identical to having the first
* prefix bits of the address set.
* If that is not the case and there are "holes" in the
* mask, the prefix is determined based on the lowest bit
* set.
*
* Returns: the CIDR prefix represented by the netmask
**/
@ -1567,6 +1573,7 @@ nm_utils_ip4_netmask_to_prefix(guint32 netmask)
{
G_STATIC_ASSERT_EXPR(__SIZEOF_INT__ == 4);
G_STATIC_ASSERT_EXPR(sizeof(int) == 4);
G_STATIC_ASSERT_EXPR(sizeof(guint) == 4);
G_STATIC_ASSERT_EXPR(sizeof(netmask) == 4);
return ((netmask != 0u) ? (guint32) (32 - __builtin_ctz(ntohl(netmask))) : 0u);
@ -1574,13 +1581,15 @@ nm_utils_ip4_netmask_to_prefix(guint32 netmask)
/**
* nm_utils_ip4_prefix_to_netmask:
* @prefix: a CIDR prefix
* @prefix: a CIDR prefix, must be not larger than 32.
*
* Returns: the netmask represented by the prefix, in network byte order
**/
guint32
nm_utils_ip4_prefix_to_netmask(guint32 prefix)
{
g_return_val_if_fail(prefix <= 32, 0xffffffffu);
return _nm_utils_ip4_prefix_to_netmask(prefix);
}