Kernel
/
iwd
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git
3
0
Fork 0
Code Releases Activity

util: Be more paranoid when parsing addresses 

Add a check to make sure that sscanf reads all 6 bytes of the address as
well.
This commit is contained in:
Denis Kenzior 2019-10-17 18:22:25 -05:00
parent f878ec275d
commit 99923c90da
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/util.c
View File

@ -112,9 +112,10 @@ const char *util_address_to_string(const uint8_t *addr)
return str; return str;
} }
bool util_string_to_address(const char *str, uint8_t *addr) bool util_string_to_address(const char *str, uint8_t *out_addr)
{ {
unsigned int i; unsigned int i;
uint8_t addr[6];
if (!str) if (!str)
return false; return false;
@ -139,9 +140,12 @@ bool util_string_to_address(const char *str, uint8_t *addr)
if (!l_ascii_isxdigit(str[i + 1])) if (!l_ascii_isxdigit(str[i + 1]))
return false; return false;
sscanf(str, "%2hhx:%2hhx:%2hhx:%2hhx:%2hhx:%2hhx", if (sscanf(str, "%2hhx:%2hhx:%2hhx:%2hhx:%2hhx:%2hhx",
&addr[0], &addr[1], &addr[2], &addr[0], &addr[1], &addr[2],
&addr[3], &addr[4], &addr[5]); &addr[3], &addr[4], &addr[5]) != 6)
return false;
memcpy(out_addr, addr, sizeof(addr));
return true; return true;
} }