applications: nrf_desktop: enable stack protection in mcuboot configs

Enabled the CONFIG_HW_STACK_PROTECTION Kconfig option in the MCUboot configurations of the relevant nRF Desktop targets. Ref: NCSDK-26764 Signed-off-by: Kamil Piszczek <[email protected]>
nrfconnect · Nov 29, 2024 · a3beffd · a3beffd
1 parent 155b9b3
commit a3beffd
Show file tree

Hide file tree

Showing 13 changed files with 4 additions and 37 deletions.
diff --git a/...cations/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/prj_release.conf b/...cations/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/prj_release.conf
@@ -6,9 +6,6 @@
 
 CONFIG_SIZE_OPTIMIZATIONS=y
 
-# Disable memory guard to avoid false faults in application after boot
-CONFIG_HW_STACK_PROTECTION=n
-
 CONFIG_SYSTEM_CLOCK_NO_WAIT=y
 
 CONFIG_MAIN_STACK_SIZE=4096

diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/prj_release.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/prj_release.conf
@@ -6,9 +6,6 @@
 
 CONFIG_SIZE_OPTIMIZATIONS=y
 
-# Disable memory guard to avoid false faults in application after boot
-CONFIG_HW_STACK_PROTECTION=n
-
 CONFIG_SYSTEM_CLOCK_NO_WAIT=y
 
 CONFIG_MAIN_STACK_SIZE=4096

diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj.conf
@@ -6,9 +6,6 @@
 
 CONFIG_SIZE_OPTIMIZATIONS=y
 
-# Disable memory guard to avoid false faults in application after boot
-CONFIG_HW_STACK_PROTECTION=n
-
 CONFIG_SYSTEM_CLOCK_NO_WAIT=y
 
 CONFIG_MAIN_STACK_SIZE=10240

diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_release.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_release.conf
@@ -6,9 +6,6 @@
 
 CONFIG_SIZE_OPTIMIZATIONS=y
 
-# Disable memory guard to avoid false faults in application after boot
-CONFIG_HW_STACK_PROTECTION=n
-
 CONFIG_SYSTEM_CLOCK_NO_WAIT=y
 
 CONFIG_MAIN_STACK_SIZE=10240

diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj.conf
@@ -6,9 +6,6 @@
 
 CONFIG_SIZE_OPTIMIZATIONS=y
 
-# Disable memory guard to avoid false faults in application after boot
-CONFIG_HW_STACK_PROTECTION=n
-
 CONFIG_SYSTEM_CLOCK_NO_WAIT=y
 
 CONFIG_MAIN_STACK_SIZE=10240

diff --git a/...cations/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj_release.conf b/...cations/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj_release.conf
@@ -6,9 +6,6 @@
 
 CONFIG_SIZE_OPTIMIZATIONS=y
 
-# Disable memory guard to avoid false faults in application after boot
-CONFIG_HW_STACK_PROTECTION=n
-
 CONFIG_SYSTEM_CLOCK_NO_WAIT=y
 
 CONFIG_MAIN_STACK_SIZE=10240

diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_fast_pair.conf
@@ -5,9 +5,6 @@
 #
 CONFIG_SIZE_OPTIMIZATIONS=y
 
-# Disable memory guard to avoid false faults in application after boot
-CONFIG_HW_STACK_PROTECTION=n
-
 CONFIG_SYSTEM_CLOCK_NO_WAIT=y
 
 CONFIG_MAIN_STACK_SIZE=10240

diff --git a/...cations/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_smp.conf b/...cations/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_smp.conf
@@ -5,9 +5,6 @@
 #
 CONFIG_SIZE_OPTIMIZATIONS=y
 
-# Disable memory guard to avoid false faults in application after boot
-CONFIG_HW_STACK_PROTECTION=n
-
 CONFIG_SYSTEM_CLOCK_NO_WAIT=y
 
 CONFIG_MAIN_STACK_SIZE=10240

diff --git a/...tions/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_fast_pair.conf b/...tions/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_fast_pair.conf
@@ -5,9 +5,6 @@
 #
 CONFIG_SIZE_OPTIMIZATIONS=y
 
-# Disable memory guard to avoid false faults in application after boot
-CONFIG_HW_STACK_PROTECTION=n
-
 CONFIG_SYSTEM_CLOCK_NO_WAIT=y
 
 CONFIG_MAIN_STACK_SIZE=10240

diff --git a/...ons/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_mcuboot_smp.conf b/...ons/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_mcuboot_smp.conf
@@ -5,9 +5,6 @@
 #
 CONFIG_SIZE_OPTIMIZATIONS=y
 
-# Disable memory guard to avoid false faults in application after boot
-CONFIG_HW_STACK_PROTECTION=n
-
 CONFIG_SYSTEM_CLOCK_NO_WAIT=y
 
 CONFIG_MAIN_STACK_SIZE=10240

diff --git a/...f_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_release_fast_pair.conf b/...f_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_release_fast_pair.conf
@@ -5,9 +5,6 @@
 #
 CONFIG_SIZE_OPTIMIZATIONS=y
 
-# Disable memory guard to avoid false faults in application after boot
-CONFIG_HW_STACK_PROTECTION=n
-
 CONFIG_SYSTEM_CLOCK_NO_WAIT=y
 
 CONFIG_MAIN_STACK_SIZE=10240

diff --git a/...ons/nrf_desktop/configuration/nrf52kbd_nrf52832/images/mcuboot/prj_release_fast_pair.conf b/...ons/nrf_desktop/configuration/nrf52kbd_nrf52832/images/mcuboot/prj_release_fast_pair.conf
@@ -5,9 +5,6 @@
 #
 CONFIG_SIZE_OPTIMIZATIONS=y
 
-# Disable memory guard to avoid false faults in application after boot
-CONFIG_HW_STACK_PROTECTION=n
-
 CONFIG_SYSTEM_CLOCK_NO_WAIT=y
 
 CONFIG_MAIN_STACK_SIZE=10240

diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst
@@ -247,7 +247,10 @@ nRF Desktop
     * :ref:`zephyr:nrf54l15dk_nrf54l15`
     * :ref:`zephyr:nrf54h20dk_nrf54h20`
 
-  * MCUboot bootloader configurations for the relevant board targets to enable the :kconfig:option:`CONFIG_FPROTECT` Kconfig option that is used to protect the bootloader partition against memory corruption.
+  * MCUboot bootloader configurations for the relevant board targets to enable the following Kconfig options:
+
+    * :kconfig:option:`CONFIG_FPROTECT`: used to protect the bootloader partition against memory corruption
+    * :kconfig:option:`CONFIG_HW_STACK_PROTECTION`: used to protect against stack overflows
 
 nRF Machine Learning (Edge Impulse)
 -----------------------------------