Merge branch 'bugfix/driver_hal_essl_static_analysis_fixes' into 'master'

driver, essl, hal: fix issues reported by PVS-Studio

Closes IDF-2749, IDF-2753, and IDF-2785

See merge request espressif/esp-idf!17490

components/driver/ledc.c

@@ -942,15 +942,19 @@ static esp_err_t ledc_fade_channel_init_check(ledc_mode_t speed_mode, ledc_chann
     if (s_ledc_fade_rec[speed_mode][channel] == NULL) {
 #if CONFIG_SPIRAM_USE_MALLOC
         s_ledc_fade_rec[speed_mode][channel] = (ledc_fade_t *) heap_caps_calloc(1, sizeof(ledc_fade_t), MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT);
-        if (!s_ledc_fade_rec[speed_mode][channel]) {
+        if (s_ledc_fade_rec[speed_mode][channel] == NULL) {
             ledc_fade_channel_deinit(speed_mode, channel);
-            return ESP_FAIL;
+            return ESP_ERR_NO_MEM;
         }
 
         memset(&s_ledc_fade_rec[speed_mode][channel]->ledc_fade_sem_storage, 0, sizeof(StaticQueue_t));
         s_ledc_fade_rec[speed_mode][channel]->ledc_fade_sem = xSemaphoreCreateBinaryStatic(&s_ledc_fade_rec[speed_mode][channel]->ledc_fade_sem_storage);
 #else
         s_ledc_fade_rec[speed_mode][channel] = (ledc_fade_t *) calloc(1, sizeof(ledc_fade_t));
+        if (s_ledc_fade_rec[speed_mode][channel] == NULL) {
+            ledc_fade_channel_deinit(speed_mode, channel);
+            return ESP_ERR_NO_MEM;
+        }
         s_ledc_fade_rec[speed_mode][channel]->ledc_fade_sem = xSemaphoreCreateBinary();
 #endif
         s_ledc_fade_rec[speed_mode][channel]->ledc_fade_mux = xSemaphoreCreateMutex();

components/driver/sdio_slave.c

@@ -403,10 +403,6 @@ esp_err_t sdio_slave_start(void)
     critical_enter_recv();
     sdio_slave_hal_recv_start(context.hal);
     critical_exit_recv();
-    ret = ESP_OK;
-    if (ret != ESP_OK) {
-        return ret;
-    }
 
     sdio_slave_hal_set_ioready(context.hal, true);
     return ESP_OK;

components/esp_serial_slave_link/essl_sdio.c

@@ -1,16 +1,8 @@
-// Copyright 2015-2019 Espressif Systems (Shanghai) PTE LTD
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+ * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #include "essl_sdio.h"
 #include "esp_log.h"
@@ -206,7 +198,7 @@ esp_err_t essl_sdio_init(void *arg, uint32_t wait_ms)
     ESP_LOGD(TAG, "Function 0 BS: %04x", (int) bs_read);
 
     // Set block sizes for functions 1 to given value (default value = 512).
-    if (ctx->block_size > 0 || ctx->block_size <= 2048) {
+    if (ctx->block_size > 0 && ctx->block_size <= 2048) {
         bs = ctx->block_size;
     } else {
         bs = 512;

components/hal/esp32/include/hal/spi_flash_ll.h

@@ -1,16 +1,8 @@
-// Copyright 2015-2019 Espressif Systems (Shanghai) PTE LTD
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+ * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 /*******************************************************************************
  * NOTICE
@@ -370,7 +362,7 @@ static inline void spi_flash_ll_set_usr_address(spi_dev_t *dev, uint32_t addr, i
         dev->addr = addr;
         dev->slv_wr_status = UINT32_MAX;
     } else {
-        uint32_t padding_ones = (bit_len == 32? 0 : UINT32_MAX >> bit_len);
+        uint32_t padding_ones = UINT32_MAX >> bit_len;
         dev->addr = (addr << (32 - bit_len)) | padding_ones;
     }
 }

components/hal/esp32/touch_sensor_hal.c

@@ -1,16 +1,8 @@
-// Copyright 2015-2019 Espressif Systems (Shanghai) PTE LTD
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+ * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 // The HAL layer for Touch sensor (common part)
 
@@ -46,6 +38,7 @@ void touch_hal_get_wakeup_status(touch_pad_t *pad_num)
     touch_ll_read_trigger_status_mask(&touch_mask);
     if (touch_mask == 0) {
         *pad_num = -1;
+    } else {
+        *pad_num = (touch_pad_t)(__builtin_ffs(touch_mask) - 1);
     }
-    *pad_num = (touch_pad_t)(__builtin_ffs(touch_mask) - 1);
 }

tools/ci/check_copyright_ignore.txt

@@ -667,7 +667,6 @@ components/esp_rom/test/test_miniz.c
 components/esp_rom/test/test_tjpgd.c
 components/esp_serial_slave_link/essl.c
 components/esp_serial_slave_link/essl_internal.h
-components/esp_serial_slave_link/essl_sdio.c
 components/esp_serial_slave_link/include/esp_serial_slave_link/essl.h
 components/esp_serial_slave_link/include/esp_serial_slave_link/essl_sdio.h
 components/esp_serial_slave_link/include/esp_serial_slave_link/essl_spi.h
@@ -827,14 +826,12 @@ components/hal/esp32/include/hal/sha_ll.h
 components/hal/esp32/include/hal/sigmadelta_ll.h
 components/hal/esp32/include/hal/soc_ll.h
 components/hal/esp32/include/hal/spi_flash_encrypted_ll.h
-components/hal/esp32/include/hal/spi_flash_ll.h
 components/hal/esp32/include/hal/touch_sensor_hal.h
 components/hal/esp32/include/hal/touch_sensor_ll.h
 components/hal/esp32/include/hal/trace_ll.h
 components/hal/esp32/include/hal/twai_ll.h
 components/hal/esp32/include/hal/uart_ll.h
 components/hal/esp32/interrupt_descriptor_table.c
-components/hal/esp32/touch_sensor_hal.c
 components/hal/esp32c3/hmac_hal.c
 components/hal/esp32c3/include/hal/aes_ll.h
 components/hal/esp32c3/include/hal/ds_ll.h