Skip to content

Commit

Permalink
fastping: fix asan warnings.
Browse files Browse the repository at this point in the history
  • Loading branch information
@pymumu
pymumu committed Jul 19, 2024
1 parent 655da27 commit 75649b6
Show file tree
Hide file tree
Showing 3 changed files with 139 additions and 51 deletions.
125 changes: 101 additions & 24 deletions src/dns.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,17 @@

#define member_size(type, member) sizeof(((type *)0)->member)

static int is_aligned(void *ptr, int aligment)
{
return ((uintptr_t)(ptr)) % aligment == 0;
}

/* read short and move pointer */
static unsigned short _dns_read_short(unsigned char **buffer)
{
unsigned short value = 0;

if ((uintptr_t)(*buffer) % 2 == 0) {
if (is_aligned(*buffer, 2)) {
value = *((unsigned short *)(*buffer));
} else {
memcpy(&value, *buffer, 2);
Expand Down Expand Up @@ -83,7 +88,7 @@ static void _dns_write_short(unsigned char **buffer, unsigned short value)
{
value = htons(value);

if ((uintptr_t)(*buffer) % 2 == 0) {
if (is_aligned(*buffer, 2)) {
*((unsigned short *)(*buffer)) = value;
} else {
memcpy(*buffer, &value, 2);
Expand All @@ -105,7 +110,7 @@ static void _dns_write_shortptr(unsigned char **buffer, void *ptrvalue)

value = htons(value);

if ((uintptr_t)(*buffer) % 2 == 0) {
if (is_aligned(*buffer, 2)) {
*((unsigned short *)(*buffer)) = value;
} else {
memcpy(*buffer, &value, 2);
Expand All @@ -118,7 +123,7 @@ static void _dns_write_shortptr(unsigned char **buffer, void *ptrvalue)
static void _dns_write_int(unsigned char **buffer, unsigned int value)
{
value = htonl(value);
if ((uintptr_t)(*buffer) % 4 == 0) {
if (is_aligned(*buffer, 4)) {
*((unsigned int *)(*buffer)) = value;
} else {
memcpy(*buffer, &value, 4);
Expand All @@ -138,7 +143,7 @@ static void _dns_write_intptr(unsigned char **buffer, void *ptrvalue)
}

value = htonl(value);
if ((uintptr_t)(*buffer) % 4 == 0) {
if (is_aligned(*buffer, 4)) {
*((unsigned int *)(*buffer)) = value;
} else {
memcpy(*buffer, &value, 4);
Expand All @@ -151,7 +156,7 @@ static unsigned int _dns_read_int(unsigned char **buffer)
{
unsigned int value = 0;

if ((uintptr_t)(*buffer) % 4 == 0) {
if (is_aligned(*buffer, 4)) {
value = *((unsigned int *)(*buffer));
} else {
memcpy(&value, *buffer, 4);
Expand Down Expand Up @@ -658,9 +663,20 @@ int dns_add_rr_nested_memcpy(struct dns_rr_nested *rr_nested, const void *data,
return -1;
}

if (is_aligned(rr_nested->context.ptr, 2) == 0) {
return -1;
}

memcpy(rr_nested->context.ptr, data, data_len);
rr_nested->context.ptr += data_len;

if (is_aligned(rr_nested->context.ptr, 2) == 0) {
if (_dns_left_len(&rr_nested->context) < 1) {
return -1;
}
_dns_write_char(&rr_nested->context.ptr, 0);
}

return 0;
}

Expand Down Expand Up @@ -714,6 +730,11 @@ void *dns_get_rr_nested_next(struct dns_rrs *rrs, void *rr_nested, int rr_nested
{
void *end = rrs->data + rrs->len;
void *p = rr_nested + rr_nested_len;

if (is_aligned(p, 2) == 0) {
p++;
}

if (p == end) {
return NULL;
} else if (p > end) {
Expand Down Expand Up @@ -1257,6 +1278,14 @@ int dns_add_HTTPS_start(struct dns_rr_nested *svcparam_buffer, struct dns_packet
safe_strncpy((char *)svcparam_buffer->context.ptr, target, target_len);
svcparam_buffer->context.ptr += target_len;

if (is_aligned(svcparam_buffer->context.ptr, 2) != 1) {
if (_dns_left_len(&svcparam_buffer->context) < 1) {
return -1;
}

_dns_write_char(&svcparam_buffer->context.ptr, 0);
}

return 0;
}

Expand All @@ -1266,9 +1295,17 @@ int dns_HTTPS_add_raw(struct dns_rr_nested *svcparam, unsigned short key, unsign
return -1;
}

dns_add_rr_nested_memcpy(svcparam, &key, 2);
dns_add_rr_nested_memcpy(svcparam, &len, 2);
dns_add_rr_nested_memcpy(svcparam, value, len);
if (dns_add_rr_nested_memcpy(svcparam, &key, 2) != 0) {
return -1;
}

if (dns_add_rr_nested_memcpy(svcparam, &len, 2) != 0) {
return -1;
}

if (dns_add_rr_nested_memcpy(svcparam, value, len) != 0) {
return -1;
}
return 0;
}

Expand All @@ -1279,11 +1316,19 @@ int dns_HTTPS_add_port(struct dns_rr_nested *svcparam, unsigned short port)
}

unsigned short value = DNS_HTTPS_T_PORT;
dns_add_rr_nested_memcpy(svcparam, &value, 2);
if (dns_add_rr_nested_memcpy(svcparam, &value, 2) != 0) {
return -1;
}

value = 2;
dns_add_rr_nested_memcpy(svcparam, &value, 2);
if (dns_add_rr_nested_memcpy(svcparam, &value, 2) != 0) {
return -1;
}

value = htons(port);
dns_add_rr_nested_memcpy(svcparam, &value, 2);
if (dns_add_rr_nested_memcpy(svcparam, &value, 2) != 0) {
return -1;
}

return 0;
}
Expand All @@ -1295,11 +1340,18 @@ int dns_HTTPS_add_alpn(struct dns_rr_nested *svcparam, const char *alpn, int alp
}

unsigned short value = DNS_HTTPS_T_ALPN;
dns_add_rr_nested_memcpy(svcparam, &value, 2);
if (dns_add_rr_nested_memcpy(svcparam, &value, 2) != 0) {
return -1;
}

value = alpn_len;
dns_add_rr_nested_memcpy(svcparam, &value, 2);
dns_add_rr_nested_memcpy(svcparam, alpn, alpn_len);
if (dns_add_rr_nested_memcpy(svcparam, &value, 2) != 0) {
return -1;
}

if (dns_add_rr_nested_memcpy(svcparam, alpn, alpn_len) != 0) {
return -1;
}

return 0;
}
Expand All @@ -1311,11 +1363,18 @@ int dns_HTTPS_add_ech(struct dns_rr_nested *svcparam, void *ech, int ech_len)
}

unsigned short value = DNS_HTTPS_T_ECH;
dns_add_rr_nested_memcpy(svcparam, &value, 2);
if (dns_add_rr_nested_memcpy(svcparam, &value, 2) != 0) {
return -1;
}

value = ech_len;
dns_add_rr_nested_memcpy(svcparam, &value, 2);
dns_add_rr_nested_memcpy(svcparam, ech, ech_len);
if (dns_add_rr_nested_memcpy(svcparam, &value, 2) != 0) {
return -1;
}

if (dns_add_rr_nested_memcpy(svcparam, ech, ech_len) != 0) {
return -1;
}

return 0;
}
Expand All @@ -1327,13 +1386,19 @@ int dns_HTTPS_add_ipv4hint(struct dns_rr_nested *svcparam, unsigned char *addr[]
}

unsigned short value = DNS_HTTPS_T_IPV4HINT;
dns_add_rr_nested_memcpy(svcparam, &value, 2);
if (dns_add_rr_nested_memcpy(svcparam, &value, 2) != 0) {
return -1;
}

value = addr_num * DNS_RR_A_LEN;
dns_add_rr_nested_memcpy(svcparam, &value, 2);
if (dns_add_rr_nested_memcpy(svcparam, &value, 2) != 0) {
return -1;
}

for (int i = 0; i < addr_num; i++) {
dns_add_rr_nested_memcpy(svcparam, addr[i], DNS_RR_A_LEN);
if (dns_add_rr_nested_memcpy(svcparam, addr[i], DNS_RR_A_LEN) != 0) {
return -1;
}
}

return 0;
Expand All @@ -1346,13 +1411,19 @@ int dns_HTTPS_add_ipv6hint(struct dns_rr_nested *svcparam, unsigned char *addr[]
}

unsigned short value = DNS_HTTPS_T_IPV6HINT;
dns_add_rr_nested_memcpy(svcparam, &value, 2);
if (dns_add_rr_nested_memcpy(svcparam, &value, 2) != 0) {
return -1;
}

value = addr_num * DNS_RR_AAAA_LEN;
dns_add_rr_nested_memcpy(svcparam, &value, 2);
if (dns_add_rr_nested_memcpy(svcparam, &value, 2) != 0) {
return -1;
}

for (int i = 0; i < addr_num; i++) {
dns_add_rr_nested_memcpy(svcparam, addr[i], DNS_RR_AAAA_LEN);
if (dns_add_rr_nested_memcpy(svcparam, addr[i], DNS_RR_AAAA_LEN) != 0) {
return -1;
}
}

return 0;
Expand Down Expand Up @@ -1397,6 +1468,12 @@ int dns_get_HTTPS_svcparm_start(struct dns_rrs *rrs, struct dns_https_param **ht
return -1;
}

/* PADDING */
if (is_aligned(data, 2) != 1) {
data++;
rr_len--;
}

if (rr_len == 0) {
*https_param = NULL;
return 0;
Expand Down
1 change: 0 additions & 1 deletion src/dns_client.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,6 @@ static struct dns_server_info *_dns_client_get_server(char *server_ip, int port,
continue;
}

pthread_mutex_unlock(&client.server_list_lock);
server_info_return = server_info;
break;
}
Expand Down
Loading

0 comments on commit 75649b6

Please sign in to comment.