Merge branch 'fix/fix_timer_wakeup_api_coverity' into 'master'

esp-wzh · esp-wzh · commit 190a12912e26 · 2025-04-08T20:14:38.000+08:00
fix(esp_hw_support): fix esp_sleep_enable_timer_wakeup API code coverity

Closes IDF-12526

See merge request espressif/esp-idf!37639
diff --git a/components/esp_hw_support/sleep_modes.c b/components/esp_hw_support/sleep_modes.c
@@ -1646,7 +1646,9 @@ esp_err_t esp_sleep_enable_ulp_wakeup(void)
 esp_err_t esp_sleep_enable_timer_wakeup(uint64_t time_in_us)
 {
 #if CONFIG_SOC_CLK_TREE_SUPPORTED
-    if (time_in_us > ((BIT64(SOC_LP_TIMER_BIT_WIDTH_LO + SOC_LP_TIMER_BIT_WIDTH_HI) - 1) / esp_clk_tree_lp_slow_get_freq_hz(ESP_CLK_TREE_SRC_FREQ_PRECISION_APPROX)) * MHZ ) {
+    uint32_t lp_slow_freq_hz = esp_clk_tree_lp_slow_get_freq_hz(ESP_CLK_TREE_SRC_FREQ_PRECISION_APPROX);
+    assert(lp_slow_freq_hz);
+    if (time_in_us > ((BIT64(SOC_LP_TIMER_BIT_WIDTH_LO + SOC_LP_TIMER_BIT_WIDTH_HI) - 1) / lp_slow_freq_hz) * MHZ ) {
         return ESP_ERR_INVALID_ARG;
     }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -1646,7 +1646,9 @@ esp_err_t esp_sleep_enable_ulp_wakeup(void)`
`1646`	`1646`	`esp_err_t esp_sleep_enable_timer_wakeup(uint64_t time_in_us)`
`1647`	`1647`	`{`
`1648`	`1648`	`#if CONFIG_SOC_CLK_TREE_SUPPORTED`
`1649`		`- if (time_in_us > ((BIT64(SOC_LP_TIMER_BIT_WIDTH_LO + SOC_LP_TIMER_BIT_WIDTH_HI) - 1) / esp_clk_tree_lp_slow_get_freq_hz(ESP_CLK_TREE_SRC_FREQ_PRECISION_APPROX)) * MHZ ) {`
	`1649`	`+ uint32_t lp_slow_freq_hz = esp_clk_tree_lp_slow_get_freq_hz(ESP_CLK_TREE_SRC_FREQ_PRECISION_APPROX);`
	`1650`	`+ assert(lp_slow_freq_hz);`
	`1651`	`+ if (time_in_us > ((BIT64(SOC_LP_TIMER_BIT_WIDTH_LO + SOC_LP_TIMER_BIT_WIDTH_HI) - 1) / lp_slow_freq_hz) * MHZ ) {`
`1650`	`1652`	`return ESP_ERR_INVALID_ARG;`
`1651`	`1653`	`}`
`1652`	`1654`	`#endif`