[sw/silicon_creator] Harden SHUTDOWN_IF_ERROR

Signed-off-by: Alphan Ulusoy <alphan@google.com>
alphan · Feb 9, 2022 · 01670cb · 01670cb
1 parent 9ba75eb
commit 01670cb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/sw/device/silicon_creator/lib/shutdown.h b/sw/device/silicon_creator/lib/shutdown.h
@@ -7,6 +7,7 @@
 #include <stdint.h>
 #include <stdnoreturn.h>
 
+#include "sw/device/lib/base/hardened.h"
 #include "sw/device/lib/base/macros.h"
 #include "sw/device/silicon_creator/lib/drivers/lifecycle.h"
 #include "sw/device/silicon_creator/lib/error.h"
@@ -22,12 +23,13 @@ extern "C" {
  *
  * @param expr_ An expression which results in an rom_error_t.
  */
-#define SHUTDOWN_IF_ERROR(expr_) \
- do { \
- rom_error_t error = (expr_); \
- if (error != kErrorOk) { \
- shutdown_finalize(error); \
- } \
+#define SHUTDOWN_IF_ERROR(expr_) \
+ do { \
+ rom_error_t error_ = expr_; \
+ if (launder32(error_) != kErrorOk) { \
+ shutdown_finalize(error_); \
+ } \
+ HARDENED_CHECK_EQ(error_, kErrorOk); \
  } while (false)
 
 /**

diff --git a/sw/device/silicon_creator/lib/shutdown_unittest.cc b/sw/device/silicon_creator/lib/shutdown_unittest.cc
@@ -599,8 +599,12 @@ TEST_F(ShutdownTest, FlashKill) {
 TEST_F(ShutdownTest, ShutdownIfErrorOk) { SHUTDOWN_IF_ERROR(kErrorOk); }
 
 TEST_F(ShutdownTest, ShutdownIfErrorUnknown) {
- ExpectFinalize(kErrorUnknown);
- SHUTDOWN_IF_ERROR(kErrorUnknown);
+ EXPECT_DEATH(
+ {
+ ExpectFinalize(kErrorUnknown);
+ SHUTDOWN_IF_ERROR(kErrorUnknown);
+ },
+ "");
 }
 
 TEST_F(ShutdownTest, SoftwareEscalate) {