michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests: net: hostname: Corrected unique hostname conversion

Browse source 
Replaced net_bytes_from_str in hostname_get test by a new function that
converts the unique part of the hostname in a byte array.

net_bytes_from_str can not be used as it assumes that the string input
is of the format "xx:xx:xx:xx:xx:xx" where as the unique part of the
hostname is a MAC address string without colons. If net_bytes_from_str
is used this could result in buffer overrun on the input string.

Signed-off-by: Jan Van Winkel <jan.van_winkel@dxplore.eu>
This commit is contained in:
Jan Van Winkel 2019-10-02 08:52:10 +02:00 • committed by Jukka Rissanen
commit 9468cb6eb1
1 changed files with 36 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

38
tests/net/hostname/src/main.c
View file

@ -269,6 +269,40 @@ static void iface_setup(void)
test_started = true;
}
static int bytes_from_hostname_unique(u8_t *buf, int buf_len, const char *src)
{
unsigned int i;
(void)memset(buf, 0, buf_len);
if ((2 * buf_len) < strlen(src)) {
return -ENOMEM;
}
for (i = 0U; i < strlen(src); i++) {
buf[i/2] <<= 4;
if (src[i] >= '0' && src[i] <= '9') {
buf[i/2] += (src[i] - '0');
continue;
}
if (src[i] >= 'A' && src[i] <= 'F') {
buf[i/2] += (10 + (src[i] - 'A'));
continue;
}
if (src[i] >= 'a' && src[i] <= 'f') {
buf[i/2] += (10 + (src[i] - 'a'));
continue;
}
return -EINVAL;
}
return 0;
}
static void hostname_get(void)
{
const char *hostname;
@ -280,10 +314,10 @@ static void hostname_get(void)
sizeof(CONFIG_NET_HOSTNAME) - 1, "");
if (IS_ENABLED(CONFIG_NET_HOSTNAME_UNIQUE)) {
char mac[8];
char mac[6];
int ret;
ret = net_bytes_from_str(mac, sizeof(mac),
ret = bytes_from_hostname_unique(mac, sizeof(mac),
hostname + sizeof(CONFIG_NET_HOSTNAME) - 1);
zassert_equal(ret, 0, "");