Skip to content

Commit 7a4fdad

Browse files
david-cermaksuren-gabrielyan-espressif
david-cermak
authored and
suren-gabrielyan-espressif
committed
mdns: check all mallocs for failure and add default hook to log error with free heap
solves crash about _mdns_result_txt_create when stress test * Original commit: espressif/esp-idf@c8cb4cd
1 parent b4e5742 commit 7a4fdad

File tree

3 files changed

+66
-0
lines changed

3 files changed

+66
-0
lines changed

‎components/mdns/mdns.c

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include "mdns.h"
1616
#include "mdns_private.h"
1717
#include "mdns_networking.h"
18+
#include "esp_log.h"
1819
#include <string.h>
1920

2021
#ifdef MDNS_ENABLE_DEBUG
@@ -26,6 +27,8 @@ static const char * MDNS_SUB_STR = "_sub";
2627

2728
mdns_server_t * _mdns_server = NULL;
2829

30+
static const char *TAG = "MDNS";
31+
2932
static volatile TaskHandle_t _mdns_service_task_handle = NULL;
3033
static SemaphoreHandle_t _mdns_service_semaphore = NULL;
3134

@@ -63,11 +66,16 @@ static char * _mdns_mangle_name(char* in) {
6366
//need to add -2 to string
6467
ret = malloc(strlen(in) + 3);
6568
if (ret == NULL) {
69+
HOOK_MALLOC_FAILED;
6670
return NULL;
6771
}
6872
sprintf(ret, "%s-2", in);
6973
} else {
7074
ret = malloc(strlen(in) + 2); //one extra byte in case 9-10 or 99-100 etc
75+
if (ret == NULL) {
76+
HOOK_MALLOC_FAILED;
77+
return NULL;
78+
}
7179
strcpy(ret, in);
7280
int baseLen = p - in; //length of 'bla' in 'bla-123'
7381
//overwrite suffix with new suffix
@@ -117,6 +125,7 @@ esp_err_t _mdns_send_rx_action(mdns_rx_packet_t * packet)
117125

118126
action = (mdns_action_t *)malloc(sizeof(mdns_action_t));
119127
if (!action) {
128+
HOOK_MALLOC_FAILED;
120129
return ESP_ERR_NO_MEM;
121130
}
122131

@@ -557,6 +566,9 @@ static uint16_t _mdns_append_txt_record(uint8_t * packet, uint16_t * index, mdns
557566
return 0;
558567
}
559568
data_len += l;
569+
} else {
570+
HOOK_MALLOC_FAILED;
571+
// continue
560572
}
561573
txt = txt->next;
562574
}
@@ -1130,6 +1142,7 @@ static bool _mdns_alloc_answer(mdns_out_answer_t ** destnation, uint16_t type, m
11301142

11311143
mdns_out_answer_t * a = (mdns_out_answer_t *)malloc(sizeof(mdns_out_answer_t));
11321144
if (!a) {
1145+
HOOK_MALLOC_FAILED;
11331146
return false;
11341147
}
11351148
a->type = type;
@@ -1148,6 +1161,7 @@ static mdns_tx_packet_t * _mdns_alloc_packet_default(tcpip_adapter_if_t tcpip_if
11481161
{
11491162
mdns_tx_packet_t * packet = (mdns_tx_packet_t*)malloc(sizeof(mdns_tx_packet_t));
11501163
if (!packet) {
1164+
HOOK_MALLOC_FAILED;
11511165
return NULL;
11521166
}
11531167
memset((uint8_t*)packet, 0, sizeof(mdns_tx_packet_t));
@@ -1285,6 +1299,7 @@ static mdns_tx_packet_t * _mdns_create_probe_packet(tcpip_adapter_if_t tcpip_if,
12851299
for (i=0; i<len; i++) {
12861300
mdns_out_question_t * q = (mdns_out_question_t *)malloc(sizeof(mdns_out_question_t));
12871301
if (!q) {
1302+
HOOK_MALLOC_FAILED;
12881303
_mdns_free_tx_packet(packet);
12891304
return NULL;
12901305
}
@@ -1310,6 +1325,7 @@ static mdns_tx_packet_t * _mdns_create_probe_packet(tcpip_adapter_if_t tcpip_if,
13101325
if (include_ip && !_str_null_or_empty(_mdns_server->hostname)) {
13111326
mdns_out_question_t * q = (mdns_out_question_t *)malloc(sizeof(mdns_out_question_t));
13121327
if (!q) {
1328+
HOOK_MALLOC_FAILED;
13131329
_mdns_free_tx_packet(packet);
13141330
return NULL;
13151331
}
@@ -1457,6 +1473,7 @@ static void _mdns_init_pcb_probe(tcpip_adapter_if_t tcpip_if, mdns_ip_protocol_t
14571473
if (services_final_len) {
14581474
_services = (mdns_srv_item_t **)malloc(sizeof(mdns_srv_item_t *) * services_final_len);
14591475
if (!_services) {
1476+
HOOK_MALLOC_FAILED;
14601477
return;
14611478
}
14621479

@@ -1737,6 +1754,7 @@ static mdns_txt_linked_item_t * _mdns_allocate_txt(size_t num_items, mdns_txt_it
17371754
for (i=0; i<num_items; i++) {
17381755
mdns_txt_linked_item_t * new_item = (mdns_txt_linked_item_t *)malloc(sizeof(mdns_txt_linked_item_t));
17391756
if (!new_item) {
1757+
HOOK_MALLOC_FAILED;
17401758
break;
17411759
}
17421760
new_item->key = strdup(txt[i].key);
@@ -1783,6 +1801,7 @@ static mdns_service_t * _mdns_create_service(const char * service, const char *
17831801
{
17841802
mdns_service_t * s = (mdns_service_t *)malloc(sizeof(mdns_service_t));
17851803
if (!s) {
1804+
HOOK_MALLOC_FAILED;
17861805
return NULL;
17871806
}
17881807

@@ -2046,6 +2065,9 @@ static int _mdns_check_txt_collision(mdns_service_t * service, const uint8_t * d
20462065
sprintf(tmp, "%s=%s", txt->key, txt->value);
20472066
_mdns_append_string(ours, &index, tmp);
20482067
free(tmp);
2068+
} else {
2069+
HOOK_MALLOC_FAILED;
2070+
// continue
20492071
}
20502072
txt = txt->next;
20512073
}
@@ -2402,6 +2424,10 @@ static void _mdns_result_txt_create(const uint8_t * data, size_t len, mdns_txt_i
24022424
}
24032425

24042426
mdns_txt_item_t * txt = (mdns_txt_item_t *)malloc(sizeof(mdns_txt_item_t) * num_items);
2427+
if (!txt) {
2428+
HOOK_MALLOC_FAILED;
2429+
return;
2430+
}
24052431
memset(txt, 0, sizeof(mdns_txt_item_t) * num_items);
24062432
size_t txt_num = 0;
24072433

@@ -2422,6 +2448,7 @@ static void _mdns_result_txt_create(const uint8_t * data, size_t len, mdns_txt_i
24222448
}
24232449
char * key = (char *)malloc(name_len + 1);
24242450
if (!key) {
2451+
HOOK_MALLOC_FAILED;
24252452
goto handle_error;//error
24262453
}
24272454

@@ -2435,6 +2462,10 @@ static void _mdns_result_txt_create(const uint8_t * data, size_t len, mdns_txt_i
24352462
int value_len = partLen - name_len - 1;
24362463
if (value_len > 0) {
24372464
char * value = (char *)malloc(value_len + 1);
2465+
if (!value) {
2466+
HOOK_MALLOC_FAILED;
2467+
goto handle_error;//error
2468+
}
24382469
memcpy(value, data + i, value_len);
24392470
value[value_len] = 0;
24402471
i += value_len;
@@ -2498,6 +2529,7 @@ void mdns_parse_packet(mdns_rx_packet_t * packet)
24982529

24992530
mdns_parsed_packet_t * parsed_packet = (mdns_parsed_packet_t *)malloc(sizeof(mdns_parsed_packet_t));
25002531
if (!parsed_packet) {
2532+
HOOK_MALLOC_FAILED;
25012533
return;
25022534
}
25032535
memset(parsed_packet, 0, sizeof(mdns_parsed_packet_t));
@@ -2560,6 +2592,7 @@ void mdns_parse_packet(mdns_rx_packet_t * packet)
25602592
while (a) {
25612593
mdns_parsed_question_t * question = (mdns_parsed_question_t *)malloc(sizeof(mdns_parsed_question_t));
25622594
if (!question) {
2595+
HOOK_MALLOC_FAILED;
25632596
goto clear_rx_packet;
25642597
}
25652598
question->next = parsed_packet->questions;
@@ -2587,6 +2620,7 @@ void mdns_parse_packet(mdns_rx_packet_t * packet)
25872620

25882621
mdns_parsed_question_t * question = (mdns_parsed_question_t *)malloc(sizeof(mdns_parsed_question_t));
25892622
if (!question) {
2623+
HOOK_MALLOC_FAILED;
25902624
goto clear_rx_packet;
25912625
}
25922626
question->next = parsed_packet->questions;
@@ -3046,6 +3080,7 @@ static mdns_search_once_t * _mdns_search_init(const char * name, const char * se
30463080
{
30473081
mdns_search_once_t * search = (mdns_search_once_t *)malloc(sizeof(mdns_search_once_t));
30483082
if (!search) {
3083+
HOOK_MALLOC_FAILED;
30493084
return NULL;
30503085
}
30513086
memset(search, 0, sizeof(mdns_search_once_t));
@@ -3137,6 +3172,7 @@ static mdns_ip_addr_t * _mdns_result_addr_create_ip(ip_addr_t * ip)
31373172
{
31383173
mdns_ip_addr_t * a = (mdns_ip_addr_t *)malloc(sizeof(mdns_ip_addr_t));
31393174
if (!a) {
3175+
HOOK_MALLOC_FAILED;
31403176
return NULL;
31413177
}
31423178
memset(a, 0 , sizeof(mdns_ip_addr_t));
@@ -3196,6 +3232,7 @@ static void _mdns_search_result_add_ip(mdns_search_once_t * search, const char *
31963232
if (!search->max_results || search->num_results < search->max_results) {
31973233
r = (mdns_result_t *)malloc(sizeof(mdns_result_t));
31983234
if (!r) {
3235+
HOOK_MALLOC_FAILED;
31993236
return;
32003237
}
32013238

@@ -3241,6 +3278,7 @@ static mdns_result_t * _mdns_search_result_add_ptr(mdns_search_once_t * search,
32413278
if (!search->max_results || search->num_results < search->max_results) {
32423279
r = (mdns_result_t *)malloc(sizeof(mdns_result_t));
32433280
if (!r) {
3281+
HOOK_MALLOC_FAILED;
32443282
return NULL;
32453283
}
32463284

@@ -3276,6 +3314,7 @@ static void _mdns_search_result_add_srv(mdns_search_once_t * search, const char
32763314
if (!search->max_results || search->num_results < search->max_results) {
32773315
r = (mdns_result_t *)malloc(sizeof(mdns_result_t));
32783316
if (!r) {
3317+
HOOK_MALLOC_FAILED;
32793318
return;
32803319
}
32813320

@@ -3315,6 +3354,7 @@ static void _mdns_search_result_add_txt(mdns_search_once_t * search, mdns_txt_it
33153354
if (!search->max_results || search->num_results < search->max_results) {
33163355
r = (mdns_result_t *)malloc(sizeof(mdns_result_t));
33173356
if (!r) {
3357+
HOOK_MALLOC_FAILED;
33183358
goto free_txt;
33193359
}
33203360

@@ -3420,6 +3460,7 @@ static mdns_tx_packet_t * _mdns_create_search_packet(mdns_search_once_t * search
34203460

34213461
mdns_out_question_t * q = (mdns_out_question_t *)malloc(sizeof(mdns_out_question_t));
34223462
if (!q) {
3463+
HOOK_MALLOC_FAILED;
34233464
_mdns_free_tx_packet(packet);
34243465
return NULL;
34253466
}
@@ -3442,6 +3483,7 @@ static mdns_tx_packet_t * _mdns_create_search_packet(mdns_search_once_t * search
34423483
}
34433484
mdns_out_answer_t * a = (mdns_out_answer_t *)malloc(sizeof(mdns_out_answer_t));
34443485
if (!a) {
3486+
HOOK_MALLOC_FAILED;
34453487
_mdns_free_tx_packet(packet);
34463488
return NULL;
34473489
}
@@ -3687,6 +3729,7 @@ static void _mdns_execute_action(mdns_action_t * action)
36873729
if (!txt) {
36883730
txt = (mdns_txt_linked_item_t *)malloc(sizeof(mdns_txt_linked_item_t));
36893731
if (!txt) {
3732+
HOOK_MALLOC_FAILED;
36903733
_mdns_free_action(action);
36913734
return;
36923735
}
@@ -3795,6 +3838,7 @@ static esp_err_t _mdns_send_search_action(mdns_action_type_t type, mdns_search_o
37953838

37963839
action = (mdns_action_t *)malloc(sizeof(mdns_action_t));
37973840
if (!action) {
3841+
HOOK_MALLOC_FAILED;
37983842
return ESP_ERR_NO_MEM;
37993843
}
38003844

@@ -3830,6 +3874,9 @@ static void _mdns_scheduler_run()
38303874
free(action);
38313875
_mdns_server->tx_queue_head = p;
38323876
}
3877+
} else {
3878+
HOOK_MALLOC_FAILED;
3879+
// continue
38333880
}
38343881
}
38353882
MDNS_SERVICE_UNLOCK();
@@ -3992,6 +4039,7 @@ esp_err_t mdns_handle_system_event(void *ctx, system_event_t *event)
39924039

39934040
mdns_action_t * action = (mdns_action_t *)malloc(sizeof(mdns_action_t));
39944041
if (!action) {
4042+
HOOK_MALLOC_FAILED;
39954043
return ESP_OK;
39964044
}
39974045
action->type = ACTION_SYSTEM_EVENT;
@@ -4013,6 +4061,7 @@ esp_err_t mdns_init()
40134061

40144062
_mdns_server = (mdns_server_t *)malloc(sizeof(mdns_server_t));
40154063
if (!_mdns_server) {
4064+
HOOK_MALLOC_FAILED;
40164065
return ESP_ERR_NO_MEM;
40174066
}
40184067
memset((uint8_t*)_mdns_server, 0, sizeof(mdns_server_t));
@@ -4115,6 +4164,7 @@ esp_err_t mdns_hostname_set(const char * hostname)
41154164

41164165
mdns_action_t * action = (mdns_action_t *)malloc(sizeof(mdns_action_t));
41174166
if (!action) {
4167+
HOOK_MALLOC_FAILED;
41184168
free(new_hostname);
41194169
return ESP_ERR_NO_MEM;
41204170
}
@@ -4143,6 +4193,7 @@ esp_err_t mdns_instance_name_set(const char * instance)
41434193

41444194
mdns_action_t * action = (mdns_action_t *)malloc(sizeof(mdns_action_t));
41454195
if (!action) {
4196+
HOOK_MALLOC_FAILED;
41464197
free(new_instance);
41474198
return ESP_ERR_NO_MEM;
41484199
}
@@ -4182,6 +4233,7 @@ esp_err_t mdns_service_add(const char * instance, const char * service, const ch
41824233

41834234
item = (mdns_srv_item_t *)malloc(sizeof(mdns_srv_item_t));
41844235
if (!item) {
4236+
HOOK_MALLOC_FAILED;
41854237
_mdns_free_service(s);
41864238
return ESP_ERR_NO_MEM;
41874239
}
@@ -4191,6 +4243,7 @@ esp_err_t mdns_service_add(const char * instance, const char * service, const ch
41914243

41924244
mdns_action_t * action = (mdns_action_t *)malloc(sizeof(mdns_action_t));
41934245
if (!action) {
4246+
HOOK_MALLOC_FAILED;
41944247
_mdns_free_service(s);
41954248
free(item);
41964249
return ESP_ERR_NO_MEM;
@@ -4227,6 +4280,7 @@ esp_err_t mdns_service_port_set(const char * service, const char * proto, uint16
42274280

42284281
mdns_action_t * action = (mdns_action_t *)malloc(sizeof(mdns_action_t));
42294282
if (!action) {
4283+
HOOK_MALLOC_FAILED;
42304284
return ESP_ERR_NO_MEM;
42314285
}
42324286
action->type = ACTION_SERVICE_PORT_SET;
@@ -4259,6 +4313,7 @@ esp_err_t mdns_service_txt_set(const char * service, const char * proto, mdns_tx
42594313

42604314
mdns_action_t * action = (mdns_action_t *)malloc(sizeof(mdns_action_t));
42614315
if (!action) {
4316+
HOOK_MALLOC_FAILED;
42624317
_mdns_free_linked_txt(new_txt);
42634318
return ESP_ERR_NO_MEM;
42644319
}
@@ -4286,6 +4341,7 @@ esp_err_t mdns_service_txt_item_set(const char * service, const char * proto, co
42864341
}
42874342
mdns_action_t * action = (mdns_action_t *)malloc(sizeof(mdns_action_t));
42884343
if (!action) {
4344+
HOOK_MALLOC_FAILED;
42894345
return ESP_ERR_NO_MEM;
42904346
}
42914347

@@ -4322,6 +4378,7 @@ esp_err_t mdns_service_txt_item_remove(const char * service, const char * proto,
43224378
}
43234379
mdns_action_t * action = (mdns_action_t *)malloc(sizeof(mdns_action_t));
43244380
if (!action) {
4381+
HOOK_MALLOC_FAILED;
43254382
return ESP_ERR_NO_MEM;
43264383
}
43274384

@@ -4359,6 +4416,7 @@ esp_err_t mdns_service_instance_name_set(const char * service, const char * prot
43594416

43604417
mdns_action_t * action = (mdns_action_t *)malloc(sizeof(mdns_action_t));
43614418
if (!action) {
4419+
HOOK_MALLOC_FAILED;
43624420
free(new_instance);
43634421
return ESP_ERR_NO_MEM;
43644422
}
@@ -4385,6 +4443,7 @@ esp_err_t mdns_service_remove(const char * service, const char * proto)
43854443

43864444
mdns_action_t * action = (mdns_action_t *)malloc(sizeof(mdns_action_t));
43874445
if (!action) {
4446+
HOOK_MALLOC_FAILED;
43884447
return ESP_ERR_NO_MEM;
43894448
}
43904449
action->type = ACTION_SERVICE_DEL;
@@ -4407,6 +4466,7 @@ esp_err_t mdns_service_remove_all()
44074466

44084467
mdns_action_t * action = (mdns_action_t *)malloc(sizeof(mdns_action_t));
44094468
if (!action) {
4469+
HOOK_MALLOC_FAILED;
44104470
return ESP_ERR_NO_MEM;
44114471
}
44124472
action->type = ACTION_SERVICES_CLEAR;

‎components/mdns/mdns_networking.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
#include <string.h>
77
#include "mdns_networking.h"
8+
#include "esp_log.h"
89

910

1011
extern mdns_server_t * _mdns_server;
@@ -13,6 +14,7 @@ extern mdns_server_t * _mdns_server;
1314
* MDNS Server Networking
1415
*
1516
*/
17+
static const char *TAG = "MDNS_Networking";
1618

1719
static struct udp_pcb * _pcb_main = NULL;
1820

@@ -118,6 +120,7 @@ static void _udp_recv(void *arg, struct udp_pcb *upcb, struct pbuf *pb, const ip
118120

119121
mdns_rx_packet_t * packet = (mdns_rx_packet_t *)malloc(sizeof(mdns_rx_packet_t));
120122
if (!packet) {
123+
HOOK_MALLOC_FAILED;
121124
//missed packet - no memory
122125
pbuf_free(this_pb);
123126
continue;

‎components/mdns/private_include/mdns_private.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,9 @@
118118
#define MDNS_SEARCH_LOCK() xSemaphoreTake(_mdns_server->search.lock, portMAX_DELAY)
119119
#define MDNS_SEARCH_UNLOCK() xSemaphoreGive(_mdns_server->search.lock)
120120

121+
#ifndef HOOK_MALLOC_FAILED
122+
#define HOOK_MALLOC_FAILED ESP_LOGE(TAG, "Cannot allocate memory (line: %d, free heap: %d bytes)", __LINE__, esp_get_free_heap_size());
123+
#endif
121124

122125
typedef enum {
123126
PCB_OFF, PCB_DUP, PCB_INIT,

0 commit comments

Comments
 (0)