alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-09-20 00:36:01 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_mbedtls_send_alert_crash' into 'master'

Browse Source 
mbedtls: Fix mbedtls_ssl_send_alert_message crash due to ssl->out_iv is NULL

Closes IDF-2968 and IDFGH-4803

See merge request espressif/esp-idf!12733
This commit is contained in:
Mahavir Jain 2021-04-22 11:00:13 +00:00
commit bcc7549802
3 changed files with 102 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
components/mbedtls/port/dynamic/esp_mbedtls_dynamic_impl.c
View File

@ -23,6 +23,33 @@
static const char *TAG = "Dynamic Impl"; static const char *TAG = "Dynamic Impl";
static void esp_mbedtls_set_buf_state(unsigned char *buf, esp_mbedtls_ssl_buf_states state)
{
struct esp_mbedtls_ssl_buf *temp = __containerof(buf, struct esp_mbedtls_ssl_buf, buf[0]);
temp->state = state;
}
static esp_mbedtls_ssl_buf_states esp_mbedtls_get_buf_state(unsigned char *buf)
{
struct esp_mbedtls_ssl_buf *temp = __containerof(buf, struct esp_mbedtls_ssl_buf, buf[0]);
return temp->state;
}
void esp_mbedtls_free_buf(unsigned char *buf)
{
struct esp_mbedtls_ssl_buf *temp = __containerof(buf, struct esp_mbedtls_ssl_buf, buf[0]);
ESP_LOGV(TAG, "free buffer @ %p", temp);
mbedtls_free(temp);
}
static void esp_mbedtls_init_ssl_buf(struct esp_mbedtls_ssl_buf *buf, unsigned int len)
{
if (buf) {
buf->state = ESP_MBEDTLS_SSL_BUF_CACHED;
buf->len = len;
}
}
static void esp_mbedtls_parse_record_header(mbedtls_ssl_context *ssl) static void esp_mbedtls_parse_record_header(mbedtls_ssl_context *ssl)
{ {
ssl->in_msgtype = ssl->in_hdr[0]; ssl->in_msgtype = ssl->in_hdr[0];
@ -118,21 +145,22 @@ static void init_rx_buffer(mbedtls_ssl_context *ssl, unsigned char *buf)
static int esp_mbedtls_alloc_tx_buf(mbedtls_ssl_context *ssl, int len) static int esp_mbedtls_alloc_tx_buf(mbedtls_ssl_context *ssl, int len)
{ {
unsigned char *buf; struct esp_mbedtls_ssl_buf *esp_buf;
if (ssl->out_buf) { if (ssl->out_buf) {
mbedtls_free(ssl->out_buf); esp_mbedtls_free_buf(ssl->out_buf);
ssl->out_buf = NULL; ssl->out_buf = NULL;
} }
buf = mbedtls_calloc(1, len); esp_buf = mbedtls_calloc(1, SSL_BUF_HEAD_OFFSET_SIZE + len);
if (!buf) { if (!esp_buf) {
ESP_LOGE(TAG, "alloc(%d bytes) failed", len); ESP_LOGE(TAG, "alloc(%d bytes) failed", SSL_BUF_HEAD_OFFSET_SIZE + len);
return MBEDTLS_ERR_SSL_ALLOC_FAILED; return MBEDTLS_ERR_SSL_ALLOC_FAILED;
} }
ESP_LOGV(TAG, "add out buffer %d bytes @ %p", len, buf); ESP_LOGV(TAG, "add out buffer %d bytes @ %p", len, esp_buf->buf);
esp_mbedtls_init_ssl_buf(esp_buf, len);
/** /**
* Mark the out_msg offset from ssl->out_buf. * Mark the out_msg offset from ssl->out_buf.
* *
@ -140,7 +168,7 @@ static int esp_mbedtls_alloc_tx_buf(mbedtls_ssl_context *ssl, int len)
*/ */
ssl->out_msg = (unsigned char *)MBEDTLS_SSL_HEADER_LEN; ssl->out_msg = (unsigned char *)MBEDTLS_SSL_HEADER_LEN;
init_tx_buffer(ssl, buf); init_tx_buffer(ssl, esp_buf->buf);
return 0; return 0;
} }
@ -150,7 +178,7 @@ int esp_mbedtls_setup_tx_buffer(mbedtls_ssl_context *ssl)
CHECK_OK(esp_mbedtls_alloc_tx_buf(ssl, TX_IDLE_BUFFER_SIZE)); CHECK_OK(esp_mbedtls_alloc_tx_buf(ssl, TX_IDLE_BUFFER_SIZE));
/* mark the out buffer has no data cached */ /* mark the out buffer has no data cached */
ssl->out_iv = NULL; esp_mbedtls_set_buf_state(ssl->out_buf, ESP_MBEDTLS_SSL_BUF_NO_CACHED);
return 0; return 0;
} }
@ -168,10 +196,7 @@ int esp_mbedtls_reset_add_tx_buffer(mbedtls_ssl_context *ssl)
int esp_mbedtls_reset_free_tx_buffer(mbedtls_ssl_context *ssl) int esp_mbedtls_reset_free_tx_buffer(mbedtls_ssl_context *ssl)
{ {
ESP_LOGV(TAG, "free out buffer @ %p", ssl->out_buf); esp_mbedtls_free_buf(ssl->out_buf);
mbedtls_free(ssl->out_buf);
init_tx_buffer(ssl, NULL); init_tx_buffer(ssl, NULL);
CHECK_OK(esp_mbedtls_setup_tx_buffer(ssl)); CHECK_OK(esp_mbedtls_setup_tx_buffer(ssl));
@ -181,21 +206,22 @@ int esp_mbedtls_reset_free_tx_buffer(mbedtls_ssl_context *ssl)
int esp_mbedtls_reset_add_rx_buffer(mbedtls_ssl_context *ssl) int esp_mbedtls_reset_add_rx_buffer(mbedtls_ssl_context *ssl)
{ {
unsigned char *buf; struct esp_mbedtls_ssl_buf *esp_buf;
if (ssl->in_buf) { if (ssl->in_buf) {
mbedtls_free(ssl->in_buf); esp_mbedtls_free_buf(ssl->in_buf);
ssl->in_buf = NULL; ssl->in_buf = NULL;
} }
buf = mbedtls_calloc(1, MBEDTLS_SSL_IN_BUFFER_LEN); esp_buf = mbedtls_calloc(1, SSL_BUF_HEAD_OFFSET_SIZE + MBEDTLS_SSL_IN_BUFFER_LEN);
if (!buf) { if (!esp_buf) {
ESP_LOGE(TAG, "alloc(%d bytes) failed", MBEDTLS_SSL_IN_BUFFER_LEN); ESP_LOGE(TAG, "alloc(%d bytes) failed", SSL_BUF_HEAD_OFFSET_SIZE + MBEDTLS_SSL_IN_BUFFER_LEN);
return MBEDTLS_ERR_SSL_ALLOC_FAILED; return MBEDTLS_ERR_SSL_ALLOC_FAILED;
} }
ESP_LOGV(TAG, "add in buffer %d bytes @ %p", MBEDTLS_SSL_IN_BUFFER_LEN, buf); ESP_LOGV(TAG, "add in buffer %d bytes @ %p", MBEDTLS_SSL_IN_BUFFER_LEN, esp_buf->buf);
esp_mbedtls_init_ssl_buf(esp_buf, MBEDTLS_SSL_IN_BUFFER_LEN);
/** /**
* Mark the in_msg offset from ssl->in_buf. * Mark the in_msg offset from ssl->in_buf.
* *
@ -203,17 +229,14 @@ int esp_mbedtls_reset_add_rx_buffer(mbedtls_ssl_context *ssl)
*/ */
ssl->in_msg = (unsigned char *)MBEDTLS_SSL_HEADER_LEN; ssl->in_msg = (unsigned char *)MBEDTLS_SSL_HEADER_LEN;
init_rx_buffer(ssl, buf); init_rx_buffer(ssl, esp_buf->buf);
return 0; return 0;
} }
void esp_mbedtls_reset_free_rx_buffer(mbedtls_ssl_context *ssl) void esp_mbedtls_reset_free_rx_buffer(mbedtls_ssl_context *ssl)
{ {
ESP_LOGV(TAG, "free in buffer @ %p", ssl->in_buf); esp_mbedtls_free_buf(ssl->in_buf);
mbedtls_free(ssl->in_buf);
init_rx_buffer(ssl, NULL); init_rx_buffer(ssl, NULL);
} }
@ -221,20 +244,19 @@ int esp_mbedtls_add_tx_buffer(mbedtls_ssl_context *ssl, size_t buffer_len)
{ {
int ret = 0; int ret = 0;
int cached = 0; int cached = 0;
unsigned char *buf; struct esp_mbedtls_ssl_buf *esp_buf;
unsigned char cache_buf[CACHE_BUFFER_SIZE]; unsigned char cache_buf[CACHE_BUFFER_SIZE];
ESP_LOGV(TAG, "--> add out"); ESP_LOGV(TAG, "--> add out");
if (ssl->out_buf) { if (ssl->out_buf) {
if (ssl->out_iv) { if (esp_mbedtls_get_buf_state(ssl->out_buf) == ESP_MBEDTLS_SSL_BUF_CACHED) {
ESP_LOGV(TAG, "out buffer is not empty"); ESP_LOGV(TAG, "out buffer is not empty");
ret = 0; ret = 0;
goto exit; goto exit;
} else { } else {
memcpy(cache_buf, ssl->out_buf, CACHE_BUFFER_SIZE); memcpy(cache_buf, ssl->out_buf, CACHE_BUFFER_SIZE);
esp_mbedtls_free_buf(ssl->out_buf);
mbedtls_free(ssl->out_buf);
init_tx_buffer(ssl, NULL); init_tx_buffer(ssl, NULL);
cached = 1; cached = 1;
} }
@ -242,15 +264,17 @@ int esp_mbedtls_add_tx_buffer(mbedtls_ssl_context *ssl, size_t buffer_len)
buffer_len = tx_buffer_len(ssl, buffer_len); buffer_len = tx_buffer_len(ssl, buffer_len);
buf = mbedtls_calloc(1, buffer_len); esp_buf = mbedtls_calloc(1, SSL_BUF_HEAD_OFFSET_SIZE + buffer_len);
if (!buf) { if (!esp_buf) {
ESP_LOGE(TAG, "alloc(%d bytes) failed", buffer_len); ESP_LOGE(TAG, "alloc(%d bytes) failed", SSL_BUF_HEAD_OFFSET_SIZE + buffer_len);
ret = MBEDTLS_ERR_SSL_ALLOC_FAILED; ret = MBEDTLS_ERR_SSL_ALLOC_FAILED;
goto exit; goto exit;
} }
ESP_LOGV(TAG, "add out buffer %d bytes @ %p", buffer_len, buf); ESP_LOGV(TAG, "add out buffer %d bytes @ %p", buffer_len, esp_buf->buf);
init_tx_buffer(ssl, buf);
esp_mbedtls_init_ssl_buf(esp_buf, buffer_len);
init_tx_buffer(ssl, esp_buf->buf);
if (cached) { if (cached) {
memcpy(ssl->out_ctr, cache_buf, COUNTER_SIZE); memcpy(ssl->out_ctr, cache_buf, COUNTER_SIZE);
@ -270,11 +294,11 @@ int esp_mbedtls_free_tx_buffer(mbedtls_ssl_context *ssl)
{ {
int ret = 0; int ret = 0;
unsigned char buf[CACHE_BUFFER_SIZE]; unsigned char buf[CACHE_BUFFER_SIZE];
unsigned char *pdata; struct esp_mbedtls_ssl_buf *esp_buf;
ESP_LOGV(TAG, "--> free out"); ESP_LOGV(TAG, "--> free out");
if (!ssl->out_buf || (ssl->out_buf && !ssl->out_iv)) { if (!ssl->out_buf || (ssl->out_buf && (esp_mbedtls_get_buf_state(ssl->out_buf) == ESP_MBEDTLS_SSL_BUF_NO_CACHED))) {
ret = 0; ret = 0;
goto exit; goto exit;
} }
@ -282,22 +306,19 @@ int esp_mbedtls_free_tx_buffer(mbedtls_ssl_context *ssl)
memcpy(buf, ssl->out_ctr, COUNTER_SIZE); memcpy(buf, ssl->out_ctr, COUNTER_SIZE);
memcpy(buf + COUNTER_SIZE, ssl->out_iv, CACHE_IV_SIZE); memcpy(buf + COUNTER_SIZE, ssl->out_iv, CACHE_IV_SIZE);
ESP_LOGV(TAG, "free out buffer @ %p", ssl->out_buf); esp_mbedtls_free_buf(ssl->out_buf);
mbedtls_free(ssl->out_buf);
init_tx_buffer(ssl, NULL); init_tx_buffer(ssl, NULL);
pdata = mbedtls_calloc(1, TX_IDLE_BUFFER_SIZE); esp_buf = mbedtls_calloc(1, SSL_BUF_HEAD_OFFSET_SIZE + TX_IDLE_BUFFER_SIZE);
if (!pdata) { if (!esp_buf) {
ESP_LOGE(TAG, "alloc(%d bytes) failed", TX_IDLE_BUFFER_SIZE); ESP_LOGE(TAG, "alloc(%d bytes) failed", SSL_BUF_HEAD_OFFSET_SIZE + TX_IDLE_BUFFER_SIZE);
return MBEDTLS_ERR_SSL_ALLOC_FAILED; return MBEDTLS_ERR_SSL_ALLOC_FAILED;
} }
memcpy(pdata, buf, CACHE_BUFFER_SIZE); esp_mbedtls_init_ssl_buf(esp_buf, TX_IDLE_BUFFER_SIZE);
init_tx_buffer(ssl, pdata); memcpy(esp_buf->buf, buf, CACHE_BUFFER_SIZE);
ssl->out_iv = NULL; init_tx_buffer(ssl, esp_buf->buf);
esp_mbedtls_set_buf_state(ssl->out_buf, ESP_MBEDTLS_SSL_BUF_NO_CACHED);
exit: exit:
ESP_LOGV(TAG, "<-- free out"); ESP_LOGV(TAG, "<-- free out");
@ -309,7 +330,7 @@ int esp_mbedtls_add_rx_buffer(mbedtls_ssl_context *ssl)
int cached = 0; int cached = 0;
int ret = 0; int ret = 0;
int buffer_len; int buffer_len;
unsigned char *buf; struct esp_mbedtls_ssl_buf *esp_buf;
unsigned char cache_buf[16]; unsigned char cache_buf[16];
unsigned char msg_head[5]; unsigned char msg_head[5];
size_t in_msglen, in_left; size_t in_msglen, in_left;
@ -317,7 +338,7 @@ int esp_mbedtls_add_rx_buffer(mbedtls_ssl_context *ssl)
ESP_LOGV(TAG, "--> add rx"); ESP_LOGV(TAG, "--> add rx");
if (ssl->in_buf) { if (ssl->in_buf) {
if (ssl->in_iv) { if (esp_mbedtls_get_buf_state(ssl->in_buf) == ESP_MBEDTLS_SSL_BUF_CACHED) {
ESP_LOGV(TAG, "in buffer is not empty"); ESP_LOGV(TAG, "in buffer is not empty");
ret = 0; ret = 0;
goto exit; goto exit;
@ -352,20 +373,21 @@ int esp_mbedtls_add_rx_buffer(mbedtls_ssl_context *ssl)
if (cached) { if (cached) {
memcpy(cache_buf, ssl->in_buf, 16); memcpy(cache_buf, ssl->in_buf, 16);
mbedtls_free(ssl->in_buf); esp_mbedtls_free_buf(ssl->in_buf);
init_rx_buffer(ssl, NULL); init_rx_buffer(ssl, NULL);
} }
buf = mbedtls_calloc(1, buffer_len); esp_buf = mbedtls_calloc(1, SSL_BUF_HEAD_OFFSET_SIZE + buffer_len);
if (!buf) { if (!esp_buf) {
ESP_LOGE(TAG, "alloc(%d bytes) failed", buffer_len); ESP_LOGE(TAG, "alloc(%d bytes) failed", SSL_BUF_HEAD_OFFSET_SIZE + buffer_len);
ret = MBEDTLS_ERR_SSL_ALLOC_FAILED; ret = MBEDTLS_ERR_SSL_ALLOC_FAILED;
goto exit; goto exit;
} }
ESP_LOGV(TAG, "add in buffer %d bytes @ %p", buffer_len, buf); ESP_LOGV(TAG, "add in buffer %d bytes @ %p", buffer_len, esp_buf->buf);
init_rx_buffer(ssl, buf); esp_mbedtls_init_ssl_buf(esp_buf, buffer_len);
init_rx_buffer(ssl, esp_buf->buf);
if (cached) { if (cached) {
memcpy(ssl->in_ctr, cache_buf, 8); memcpy(ssl->in_ctr, cache_buf, 8);
@ -386,7 +408,7 @@ int esp_mbedtls_free_rx_buffer(mbedtls_ssl_context *ssl)
{ {
int ret = 0; int ret = 0;
unsigned char buf[16]; unsigned char buf[16];
unsigned char *pdata; struct esp_mbedtls_ssl_buf *esp_buf;
ESP_LOGV(TAG, "--> free rx"); ESP_LOGV(TAG, "--> free rx");
@ -394,7 +416,7 @@ int esp_mbedtls_free_rx_buffer(mbedtls_ssl_context *ssl)
* When have read multi messages once, can't free the input buffer directly. * When have read multi messages once, can't free the input buffer directly.
*/ */
if (!ssl->in_buf || (ssl->in_hslen && (ssl->in_hslen < ssl->in_msglen)) || if (!ssl->in_buf || (ssl->in_hslen && (ssl->in_hslen < ssl->in_msglen)) ||
(ssl->in_buf && !ssl->in_iv)) { (ssl->in_buf && (esp_mbedtls_get_buf_state(ssl->in_buf) == ESP_MBEDTLS_SSL_BUF_NO_CACHED))) {
ret = 0; ret = 0;
goto exit; goto exit;
} }
@ -409,23 +431,20 @@ int esp_mbedtls_free_rx_buffer(mbedtls_ssl_context *ssl)
memcpy(buf, ssl->in_ctr, 8); memcpy(buf, ssl->in_ctr, 8);
memcpy(buf + 8, ssl->in_iv, 8); memcpy(buf + 8, ssl->in_iv, 8);
ESP_LOGV(TAG, "free in buffer @ %p", ssl->out_buf); esp_mbedtls_free_buf(ssl->in_buf);
mbedtls_free(ssl->in_buf);
init_rx_buffer(ssl, NULL); init_rx_buffer(ssl, NULL);
pdata = mbedtls_calloc(1, 16); esp_buf = mbedtls_calloc(1, SSL_BUF_HEAD_OFFSET_SIZE + 16);
if (!pdata) { if (!esp_buf) {
ESP_LOGE(TAG, "alloc(%d bytes) failed", 16); ESP_LOGE(TAG, "alloc(%d bytes) failed", SSL_BUF_HEAD_OFFSET_SIZE + 16);
ret = MBEDTLS_ERR_SSL_ALLOC_FAILED; ret = MBEDTLS_ERR_SSL_ALLOC_FAILED;
goto exit; goto exit;
} }
memcpy(pdata, buf, 16); esp_mbedtls_init_ssl_buf(esp_buf, 16);
init_rx_buffer(ssl, pdata); memcpy(esp_buf->buf, buf, 16);
ssl->in_iv = NULL; init_rx_buffer(ssl, esp_buf->buf);
esp_mbedtls_set_buf_state(ssl->in_buf, ESP_MBEDTLS_SSL_BUF_NO_CACHED);
exit: exit:
ESP_LOGV(TAG, "<-- free rx"); ESP_LOGV(TAG, "<-- free rx");

15
components/mbedtls/port/dynamic/esp_mbedtls_dynamic_impl.h
View File

@ -41,6 +41,21 @@
\ \
}) })
typedef enum {
ESP_MBEDTLS_SSL_BUF_CACHED,
ESP_MBEDTLS_SSL_BUF_NO_CACHED,
} esp_mbedtls_ssl_buf_states;
struct esp_mbedtls_ssl_buf {
esp_mbedtls_ssl_buf_states state;
unsigned int len;
unsigned char buf[];
};
#define SSL_BUF_HEAD_OFFSET_SIZE offsetof(struct esp_mbedtls_ssl_buf, buf)
void esp_mbedtls_free_buf(unsigned char *buf);
int esp_mbedtls_setup_tx_buffer(mbedtls_ssl_context *ssl); int esp_mbedtls_setup_tx_buffer(mbedtls_ssl_context *ssl);
void esp_mbedtls_setup_rx_buffer(mbedtls_ssl_context *ssl); void esp_mbedtls_setup_rx_buffer(mbedtls_ssl_context *ssl);

4
components/mbedtls/port/dynamic/esp_ssl_tls.c
View File

@ -108,12 +108,12 @@ int __wrap_mbedtls_ssl_read(mbedtls_ssl_context *ssl, unsigned char *buf, size_t
void __wrap_mbedtls_ssl_free(mbedtls_ssl_context *ssl) void __wrap_mbedtls_ssl_free(mbedtls_ssl_context *ssl)
{ {
if (ssl->out_buf) { if (ssl->out_buf) {
mbedtls_free(ssl->out_buf); esp_mbedtls_free_buf(ssl->out_buf);
ssl->out_buf = NULL; ssl->out_buf = NULL;
} }
if (ssl->in_buf) { if (ssl->in_buf) {
mbedtls_free(ssl->in_buf); esp_mbedtls_free_buf(ssl->in_buf);
ssl->in_buf = NULL; ssl->in_buf = NULL;
} }