From 3a40b3b3491c9640b98865c55008fc59bf236f55 Mon Sep 17 00:00:00 2001 From: aditi_lonkar Date: Tue, 23 Mar 2021 11:57:50 +0530 Subject: [PATCH 1/6] fatfs: Fix some memory leak issues by coverity static analyzer. --- components/fatfs/src/ff.c | 5 ++++- components/fatfs/vfs/vfs_fat.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/components/fatfs/src/ff.c b/components/fatfs/src/ff.c index d9833c72e1..6b16b45492 100644 --- a/components/fatfs/src/ff.c +++ b/components/fatfs/src/ff.c @@ -5586,7 +5586,10 @@ FRESULT f_mkfs ( sz_buf = len / ss; /* Size of working buffer (sector) */ szb_buf = sz_buf * ss; /* Size of working buffer (byte) */ } - if (!buf || sz_buf == 0) return FR_NOT_ENOUGH_CORE; + if (!buf || sz_buf == 0) { + ff_memfree(buf); + return FR_NOT_ENOUGH_CORE; + } /* Determine where the volume to be located (b_vol, sz_vol) */ if (FF_MULTI_PARTITION && part != 0) { diff --git a/components/fatfs/vfs/vfs_fat.c b/components/fatfs/vfs/vfs_fat.c index f99728e02e..e77a22e025 100644 --- a/components/fatfs/vfs/vfs_fat.c +++ b/components/fatfs/vfs/vfs_fat.c @@ -630,12 +630,12 @@ static int vfs_fat_link(void* ctx, const char* n1, const char* n2) } fail3: f_close(pf2); - free(pf2); fail2: f_close(pf1); - free(pf1); fail1: free(buf); + free(pf2); + free(pf1); if (res != FR_OK) { ESP_LOGD(TAG, "%s: fresult=%d", __func__, res); errno = fresult_to_errno(res); From a6e44ac881b3b814527f31713bb02eda714abdc3 Mon Sep 17 00:00:00 2001 From: aditi_lonkar Date: Tue, 23 Mar 2021 11:58:32 +0530 Subject: [PATCH 2/6] tcp_transport: Fix some memory leak issues by coverity static analyzer. --- components/tcp_transport/transport_ssl.c | 5 ++++- components/tcp_transport/transport_tcp.c | 5 ++++- components/tcp_transport/transport_ws.c | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/components/tcp_transport/transport_ssl.c b/components/tcp_transport/transport_ssl.c index b32fbcc624..c8ee4b0491 100644 --- a/components/tcp_transport/transport_ssl.c +++ b/components/tcp_transport/transport_ssl.c @@ -244,7 +244,10 @@ esp_transport_handle_t esp_transport_ssl_init() { esp_transport_handle_t t = esp_transport_init(); transport_ssl_t *ssl = calloc(1, sizeof(transport_ssl_t)); - ESP_TRANSPORT_MEM_CHECK(TAG, ssl, return NULL); + ESP_TRANSPORT_MEM_CHECK(TAG, ssl, { + esp_transport_destroy(t); + return NULL; + }); esp_transport_set_context_data(t, ssl); esp_transport_set_func(t, ssl_connect, ssl_read, ssl_write, ssl_close, ssl_poll_read, ssl_poll_write, ssl_destroy); esp_transport_set_async_connect_func(t, ssl_connect_async); diff --git a/components/tcp_transport/transport_tcp.c b/components/tcp_transport/transport_tcp.c index af3954a5f5..b5c317f9c7 100644 --- a/components/tcp_transport/transport_tcp.c +++ b/components/tcp_transport/transport_tcp.c @@ -226,7 +226,10 @@ esp_transport_handle_t esp_transport_tcp_init() { esp_transport_handle_t t = esp_transport_init(); transport_tcp_t *tcp = calloc(1, sizeof(transport_tcp_t)); - ESP_TRANSPORT_MEM_CHECK(TAG, tcp, return NULL); + ESP_TRANSPORT_MEM_CHECK(TAG, tcp, { + esp_transport_destroy(t); + return NULL; + }); tcp->sock = -1; esp_transport_set_func(t, tcp_connect, tcp_read, tcp_write, tcp_close, tcp_poll_read, tcp_poll_write, tcp_destroy); esp_transport_set_context_data(t, tcp); diff --git a/components/tcp_transport/transport_ws.c b/components/tcp_transport/transport_ws.c index ea5ee29bc1..a636e5c294 100644 --- a/components/tcp_transport/transport_ws.c +++ b/components/tcp_transport/transport_ws.c @@ -441,12 +441,14 @@ esp_transport_handle_t esp_transport_ws_init(esp_transport_handle_t parent_handl ws->path = strdup("/"); ESP_TRANSPORT_MEM_CHECK(TAG, ws->path, { free(ws); + esp_transport_destroy(t); return NULL; }); ws->buffer = malloc(DEFAULT_WS_BUFFER); ESP_TRANSPORT_MEM_CHECK(TAG, ws->buffer, { free(ws->path); free(ws); + esp_transport_destroy(t); return NULL; }); From 903f7bb99fe927077ec64cd004660796639b5886 Mon Sep 17 00:00:00 2001 From: aditi_lonkar Date: Tue, 23 Mar 2021 11:59:09 +0530 Subject: [PATCH 3/6] wpa_supplicant: Fix some memory leak issues by coverity static analyzer. --- components/wpa_supplicant/src/common/sae.c | 6 ++++-- components/wpa_supplicant/src/esp_supplicant/esp_wpa2.c | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/components/wpa_supplicant/src/common/sae.c b/components/wpa_supplicant/src/common/sae.c index 29a41c4566..45ae4ef5cb 100644 --- a/components/wpa_supplicant/src/common/sae.c +++ b/components/wpa_supplicant/src/common/sae.c @@ -675,7 +675,7 @@ static int sae_derive_commit_element_ffc(struct sae_data *sae, static int sae_derive_commit(struct sae_data *sae) { - struct crypto_bignum *mask; + struct crypto_bignum *mask = NULL; int ret = -1; unsigned int counter = 0; @@ -690,7 +690,9 @@ static int sae_derive_commit(struct sae_data *sae) */ return ESP_FAIL; } - + if (mask) { + crypto_bignum_deinit(mask, 1); + } mask = sae_get_rand_and_mask(sae); if (mask == NULL) { wpa_printf(MSG_DEBUG, "SAE: Could not get rand/mask"); diff --git a/components/wpa_supplicant/src/esp_supplicant/esp_wpa2.c b/components/wpa_supplicant/src/esp_supplicant/esp_wpa2.c index 6efa86d9f9..da543cd0a4 100644 --- a/components/wpa_supplicant/src/esp_supplicant/esp_wpa2.c +++ b/components/wpa_supplicant/src/esp_supplicant/esp_wpa2.c @@ -748,6 +748,7 @@ static int eap_peer_sm_init(void) s_wpa2_data_lock = xSemaphoreCreateRecursiveMutex(); if (!s_wpa2_data_lock) { + free(sm); wpa_printf(MSG_ERROR, "wpa2 eap_peer_sm_init: failed to alloc data lock"); return ESP_ERR_NO_MEM; } From 53f5b64887927189b959788cd4a86f88f2a90971 Mon Sep 17 00:00:00 2001 From: aditi_lonkar Date: Tue, 23 Mar 2021 11:59:34 +0530 Subject: [PATCH 4/6] wifi_provisioning: Fix some memory leak issues by coverity static analyzer. --- components/wifi_provisioning/src/wifi_config.c | 1 + 1 file changed, 1 insertion(+) diff --git a/components/wifi_provisioning/src/wifi_config.c b/components/wifi_provisioning/src/wifi_config.c index 93e3e85643..73e8a747a8 100644 --- a/components/wifi_provisioning/src/wifi_config.c +++ b/components/wifi_provisioning/src/wifi_config.c @@ -83,6 +83,7 @@ static esp_err_t cmd_get_status_handler(WiFiConfigPayload *req, malloc(sizeof(WifiConnectedState))); if (!connected) { ESP_LOGE(TAG, "Error allocating memory"); + free(resp_payload); return ESP_ERR_NO_MEM; } resp_payload->connected = connected; From 426e0f394888aa326f05d168c0027f931a1e4bb2 Mon Sep 17 00:00:00 2001 From: aditi_lonkar Date: Tue, 23 Mar 2021 12:00:01 +0530 Subject: [PATCH 5/6] esp_http_client: Fix some memory leak issues by coverity static analyzer. --- components/esp_http_client/lib/http_header.c | 1 + 1 file changed, 1 insertion(+) diff --git a/components/esp_http_client/lib/http_header.c b/components/esp_http_client/lib/http_header.c index 0e41786ec7..e432e91e6b 100644 --- a/components/esp_http_client/lib/http_header.c +++ b/components/esp_http_client/lib/http_header.c @@ -97,6 +97,7 @@ static esp_err_t http_header_new_item(http_header_handle_t header, const char *k _header_new_item_exit: free(item->key); free(item->value); + free(item); return ESP_ERR_NO_MEM; } From 8719683deba3c4ac0a84d8ca512cb9df2cf0cac8 Mon Sep 17 00:00:00 2001 From: aditi_lonkar Date: Tue, 23 Mar 2021 12:00:29 +0530 Subject: [PATCH 6/6] esp_local_ctrl: Fix some memory leak issues by coverity static analyzer. --- components/esp_local_ctrl/src/esp_local_ctrl_handler.c | 1 + 1 file changed, 1 insertion(+) diff --git a/components/esp_local_ctrl/src/esp_local_ctrl_handler.c b/components/esp_local_ctrl/src/esp_local_ctrl_handler.c index 23a92abd6c..794a473dfc 100644 --- a/components/esp_local_ctrl/src/esp_local_ctrl_handler.c +++ b/components/esp_local_ctrl/src/esp_local_ctrl_handler.c @@ -166,6 +166,7 @@ static esp_err_t cmd_set_prop_vals_handler(LocalCtrlMessage *req, ESP_LOGE(TAG, "Failed to allocate memory for setting values"); free(idxs); free(vals); + free(resp_payload); return ESP_ERR_NO_MEM; } for (size_t i = 0; i < req->cmd_set_prop_vals->n_props; i++) {