arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-01-20 20:31:06 +00:00
Code Issues Releases Wiki Activity

fix(core): fix translation area access from coreapp applet

Browse Source 
[no changelog]
This commit is contained in:
tychovrahe 2024-12-05 16:36:23 +01:00 committed by TychoVrahe
parent 81adeb247d
commit b4ba056a39
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/embed/projects/kernel/main.c
View File

@ -235,7 +235,11 @@ static void coreapp_init(applet_t *applet) {
#endif #endif
}; };
applet_init(applet, coreapp_header, &coreapp_layout); applet_privileges_t coreapp_privileges = {
.assets_area_access = true,
};
applet_init(applet, coreapp_header, &coreapp_layout, &coreapp_privileges);
} }
// Shows RSOD (Red Screen of Death) // Shows RSOD (Red Screen of Death)

12
core/embed/sys/task/inc/sys/applet.h
View File

@ -55,22 +55,28 @@ typedef struct {
} applet_layout_t; } applet_layout_t;
// Applet privileges
typedef struct {
bool assets_area_access;
} applet_privileges_t;
typedef struct { typedef struct {
// Points to the applet header found at the beginning of the applet binary // Points to the applet header found at the beginning of the applet binary
applet_header_t* header; applet_header_t* header;
// Applet memory layout describing the memory areas // Applet memory layout describing the memory areas
// the applet is allowed to use // the applet is allowed to use
applet_layout_t layout; applet_layout_t layout;
// Applet privileges
applet_privileges_t privileges;
// Applet task // Applet task
systask_t task; systask_t task;
// + privileges
} applet_t; } applet_t;
// Initializes the applet structure // Initializes the applet structure
void applet_init(applet_t* applet, applet_header_t* header, void applet_init(applet_t* applet, applet_header_t* header,
applet_layout_t* layout); applet_layout_t* layout, applet_privileges_t* privileges);
// Resets the applet and prepares it for execution from its entry point. // Resets the applet and prepares it for execution from its entry point.
// //

8
core/embed/sys/task/stm32/applet.c
View File

@ -17,6 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <trezor_model.h>
#include <trezor_rtl.h> #include <trezor_rtl.h>
#include <io/display.h> #include <io/display.h>
@ -32,11 +33,12 @@
#ifdef SYSCALL_DISPATCH #ifdef SYSCALL_DISPATCH
void applet_init(applet_t* applet, applet_header_t* header, void applet_init(applet_t* applet, applet_header_t* header,
applet_layout_t* layout) { applet_layout_t* layout, applet_privileges_t* privileges) {
memset(applet, 0, sizeof(applet_t)); memset(applet, 0, sizeof(applet_t));
applet->header = header; applet->header = header;
applet->layout = *layout; applet->layout = *layout;
applet->privileges = *privileges;
} }
static void applet_clear_memory(applet_t* applet) { static void applet_clear_memory(applet_t* applet) {
@ -86,6 +88,10 @@ static void applet_set_unpriv(applet_t* applet, bool unpriv) {
tz_set_flash_unpriv(layout->code1.start, layout->code1.size, unpriv); tz_set_flash_unpriv(layout->code1.start, layout->code1.size, unpriv);
tz_set_flash_unpriv(layout->code2.start, layout->code2.size, unpriv); tz_set_flash_unpriv(layout->code2.start, layout->code2.size, unpriv);
if (applet->privileges.assets_area_access) {
tz_set_flash_unpriv(ASSETS_START, ASSETS_MAXSIZE, unpriv);
}
display_set_unpriv_access(unpriv); display_set_unpriv_access(unpriv);
} }
#endif // USE_TRUSTZONE #endif // USE_TRUSTZONE