feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

[gpio] calloc in critical section

Browse Source 
Remove calloc out of critical section. In critical section, assign allocated memory to gpio_isr_func.
Free resources if gpio_isr_register() fails.
This commit is contained in:
tgotic
2022-08-03 14:31:32 +02:00
committed by songruojing
parent 87fbc2f487
commit 34ff721c92
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
components/driver/gpio/gpio.c
View File

@@ -447,14 +447,17 @@ static void IRAM_ATTR gpio_intr_service(void *arg)
esp_err_t gpio_install_isr_service(int intr_alloc_flags) esp_err_t gpio_install_isr_service(int intr_alloc_flags)
{ {
GPIO_CHECK(gpio_context.gpio_isr_func == NULL, "GPIO isr service already installed", ESP_ERR_INVALID_STATE); GPIO_CHECK(gpio_context.gpio_isr_func == NULL, "GPIO isr service already installed", ESP_ERR_INVALID_STATE);
esp_err_t ret; esp_err_t ret = ESP_ERR_NO_MEM;
portENTER_CRITICAL(&gpio_context.gpio_spinlock); gpio_isr_func_t *isr_func = (gpio_isr_func_t *) calloc(GPIO_NUM_MAX, sizeof(gpio_isr_func_t));
gpio_context.gpio_isr_func = (gpio_isr_func_t *) calloc(GPIO_NUM_MAX, sizeof(gpio_isr_func_t)); if (isr_func) {
portEXIT_CRITICAL(&gpio_context.gpio_spinlock); portENTER_CRITICAL(&gpio_context.gpio_spinlock);
if (gpio_context.gpio_isr_func == NULL) { gpio_context.gpio_isr_func = isr_func;
ret = ESP_ERR_NO_MEM; portEXIT_CRITICAL(&gpio_context.gpio_spinlock);
} else {
ret = gpio_isr_register(gpio_intr_service, NULL, intr_alloc_flags, &gpio_context.gpio_isr_handle); ret = gpio_isr_register(gpio_intr_service, NULL, intr_alloc_flags, &gpio_context.gpio_isr_handle);
if (ret != ESP_OK) {
// registering failed, free allocated resources
gpio_uninstall_isr_service();
}
} }
return ret; return ret;