Merge pull request #616 from LedgerHQ/fix/apa/consecutive_eip712

apaillier-ledger · web-flow · commit 9c5c9bc92c93 · 2024-07-26T14:42:03.000+02:00
Fix uninitialized UI buffer for EIP-712
diff --git a/src_features/signMessageEIP712/ui_logic.c b/src_features/signMessageEIP712/ui_logic.c
@@ -177,8 +177,7 @@ e_eip712_nfs ui_712_next_field(void) {
             handle_eip712_return_code(true);
             state = EIP712_FIELD_INCOMING;
             // So that later when we append to them, we start from an empty string
-            explicit_bzero(strings.tmp.tmp, sizeof(strings.tmp.tmp));
-            explicit_bzero(strings.tmp.tmp2, sizeof(strings.tmp.tmp2));
+            explicit_bzero(&strings, sizeof(strings));
         }
     }
     return state;
@@ -622,6 +621,7 @@ bool ui_712_init(void) {
     if ((ui_ctx = MEM_ALLOC_AND_ALIGN_TYPE(*ui_ctx))) {
         explicit_bzero(ui_ctx, sizeof(*ui_ctx));
         ui_ctx->filtering_mode = EIP712_FILTERING_BASIC;
+        explicit_bzero(&strings, sizeof(strings));
     } else {
         apdu_response_code = APDU_RESPONSE_INSUFFICIENT_MEMORY;
     }

Original file line number	Diff line number	Diff line change
`@@ -177,8 +177,7 @@ e_eip712_nfs ui_712_next_field(void) {`
`177`	`177`	`handle_eip712_return_code(true);`
`178`	`178`	`state = EIP712_FIELD_INCOMING;`
`179`	`179`	`// So that later when we append to them, we start from an empty string`
`180`		`- explicit_bzero(strings.tmp.tmp, sizeof(strings.tmp.tmp));`
`181`		`- explicit_bzero(strings.tmp.tmp2, sizeof(strings.tmp.tmp2));`
	`180`	`+ explicit_bzero(&strings, sizeof(strings));`
`182`	`181`	`}`
`183`	`182`	`}`
`184`	`183`	`return state;`
`@@ -622,6 +621,7 @@ bool ui_712_init(void) {`
`622`	`621`	`if ((ui_ctx = MEM_ALLOC_AND_ALIGN_TYPE(*ui_ctx))) {`
`623`	`622`	`explicit_bzero(ui_ctx, sizeof(*ui_ctx));`
`624`	`623`	`ui_ctx->filtering_mode = EIP712_FILTERING_BASIC;`
	`624`	`+ explicit_bzero(&strings, sizeof(strings));`
`625`	`625`	`} else {`
`626`	`626`	`apdu_response_code = APDU_RESPONSE_INSUFFICIENT_MEMORY;`
`627`	`627`	`}`