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

core: refactor nm_ethernet_address_is_valid() and reject invalid addresses

Browse Source 
nm_ethernet_address_is_valid() did not check whether @addr was a valid
address in the first place. It only checked whether the address was not
equal to a few notorious MAC addresses.

At the same time, be more forgiving and accept %NULL as argument.
This fixes an assertion nm_ap_match_in_hash().
This commit is contained in:
Thomas Haller
2015-04-23 12:51:01 +02:00
parent dbb3b44ca6
commit 842ec6163d
2 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/NetworkManagerUtils.c
View File

@@ -71,36 +71,36 @@
gboolean
nm_ethernet_address_is_valid (gconstpointer addr, gssize len)
{
guint8 invalid_addr1[ETH_ALEN] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
guint8 invalid_addr2[ETH_ALEN] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
guint8 invalid_addr3[ETH_ALEN] = {0x44, 0x44, 0x44, 0x44, 0x44, 0x44};
guint8 invalid_addr4[ETH_ALEN] = {0x00, 0x30, 0xb4, 0x00, 0x00, 0x00}; /* prism54 dummy MAC */
guchar first_octet;
guint8 invalid_addr[4][ETH_ALEN] = {
{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
{0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
{0x44, 0x44, 0x44, 0x44, 0x44, 0x44},
{0x00, 0x30, 0xb4, 0x00, 0x00, 0x00}, /* prism54 dummy MAC */
};
guint8 addr_bin[ETH_ALEN];
guint i;
g_return_val_if_fail (addr != NULL, FALSE);
g_return_val_if_fail (len == ETH_ALEN || len == -1, FALSE);
/* Compare the AP address the card has with invalid ethernet MAC addresses. */
if (nm_utils_hwaddr_matches (addr, len, invalid_addr1, ETH_ALEN))
if (!addr) {
g_return_val_if_fail (len == -1 || len == ETH_ALEN, FALSE);
return FALSE;
}
if (nm_utils_hwaddr_matches (addr, len, invalid_addr2, ETH_ALEN))
return FALSE;
if (nm_utils_hwaddr_matches (addr, len, invalid_addr3, ETH_ALEN))
return FALSE;
if (nm_utils_hwaddr_matches (addr, len, invalid_addr4, ETH_ALEN))
if (len == -1) {
if (!nm_utils_hwaddr_aton (addr, addr_bin, ETH_ALEN))
return FALSE;
addr = addr_bin;
} else if (len != ETH_ALEN)
g_return_val_if_reached (FALSE);
/* Check for multicast address */
if (len == -1)
first_octet = strtoul (addr, NULL, 16);
else
first_octet = ((guint8 *)addr)[0];
if (first_octet & 0x01)
if ((((guint8 *) addr)[0]) & 0x01)
return FALSE;
for (i = 0; i < G_N_ELEMENTS (invalid_addr); i++) {
if (nm_utils_hwaddr_matches (addr, ETH_ALEN, invalid_addr[i], ETH_ALEN))
return FALSE;
}
return TRUE;
}

7
src/tests/test-general-with-expect.c
View File

@@ -434,14 +434,17 @@ test_nm_utils_array_remove_at_indexes ()
static void
test_nm_ethernet_address_is_valid ()
{
g_assert (!nm_ethernet_address_is_valid (NULL, -1));
g_assert (!nm_ethernet_address_is_valid (NULL, ETH_ALEN));
g_assert (!nm_ethernet_address_is_valid ("FF:FF:FF:FF:FF:FF", -1));
g_assert (!nm_ethernet_address_is_valid ("00:00:00:00:00:00", -1));
g_assert (!nm_ethernet_address_is_valid ("44:44:44:44:44:44", -1));
g_assert (!nm_ethernet_address_is_valid ("00:30:b4:00:00:00", -1));
g_assert ( nm_ethernet_address_is_valid ("", -1));
g_assert (!nm_ethernet_address_is_valid ("", -1));
g_assert (!nm_ethernet_address_is_valid ("1", -1));
g_assert ( nm_ethernet_address_is_valid ("2", -1));
g_assert (!nm_ethernet_address_is_valid ("2", -1));
g_assert (!nm_ethernet_address_is_valid (((guint8[8]) { 0x00,0x30,0xb4,0x00,0x00,0x00 }), ETH_ALEN));
g_assert ( nm_ethernet_address_is_valid (((guint8[8]) { 0x00,0x30,0xb4,0x00,0x00,0x01 }), ETH_ALEN));