espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-05 05:34:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/coap_pointer_check_for_dynamic_memory' into 'master'

Browse Source 
coap: Fixed NULL checks for dymanic memory allocation in coap_mbedtls.c

Closes IDF-2794

See merge request espressif/esp-idf!12585
This commit is contained in:
Mahavir Jain
2021-03-03 04:14:00 +00:00
parent c786ba9186 3e533be8be
commit 7dd81949db
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
components/coap/port/coap_mbedtls.c
View File

@@ -722,6 +722,11 @@ pki_sni_callback(void *p_info, mbedtls_ssl_context *ssl,
coap_dtls_key_t *new_entry; coap_dtls_key_t *new_entry;
name = mbedtls_malloc(name_len+1); name = mbedtls_malloc(name_len+1);
if (name == NULL) {
ret = -1;
goto end;
}
memcpy(name, uname, name_len); memcpy(name, uname, name_len);
name[name_len] = '\000'; name[name_len] = '\000';
new_entry = new_entry =
@@ -736,6 +741,12 @@ pki_sni_callback(void *p_info, mbedtls_ssl_context *ssl,
m_context->pki_sni_entry_list = m_context->pki_sni_entry_list =
mbedtls_realloc(m_context->pki_sni_entry_list, mbedtls_realloc(m_context->pki_sni_entry_list,
(i+1)*sizeof(pki_sni_entry)); (i+1)*sizeof(pki_sni_entry));
if (m_context->pki_sni_entry_list == NULL) {
ret = -1;
mbedtls_free(name);
goto end;
}
m_context->pki_sni_entry_list[i].sni = name; m_context->pki_sni_entry_list[i].sni = name;
m_context->pki_sni_entry_list[i].pki_key = *new_entry; m_context->pki_sni_entry_list[i].pki_key = *new_entry;
sni_setup_data = m_context->setup_data; sni_setup_data = m_context->setup_data;
@@ -797,6 +808,11 @@ psk_sni_callback(void *p_info, mbedtls_ssl_context *ssl,
const coap_dtls_spsk_info_t *new_entry; const coap_dtls_spsk_info_t *new_entry;
name = mbedtls_malloc(name_len+1); name = mbedtls_malloc(name_len+1);
if (name == NULL) {
ret = -1;
goto end;
}
memcpy(name, uname, name_len); memcpy(name, uname, name_len);
name[name_len] = '\000'; name[name_len] = '\000';
@@ -816,6 +832,12 @@ psk_sni_callback(void *p_info, mbedtls_ssl_context *ssl,
mbedtls_realloc(m_context->psk_sni_entry_list, mbedtls_realloc(m_context->psk_sni_entry_list,
(i+1)*sizeof(psk_sni_entry)); (i+1)*sizeof(psk_sni_entry));
if (m_context->psk_sni_entry_list == NULL) {
ret = -1;
mbedtls_free(name);
goto end;
}
m_context->psk_sni_entry_list[i].sni.s = name; m_context->psk_sni_entry_list[i].sni.s = name;
m_context->psk_sni_entry_list[i].sni.length = name_len; m_context->psk_sni_entry_list[i].sni.length = name_len;
m_context->psk_sni_entry_list[i].psk_info = *new_entry; m_context->psk_sni_entry_list[i].psk_info = *new_entry;