nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-12-22 20:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Put the loaded bootconfig in the evt page

Browse source
This commit is contained in:
TuxSH 2018-03-01 11:06:55 +01:00
parent b67ce08f84
commit 7850d3fd57
2 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
exosphere/src/bootconfig.c
View file

@ -8,12 +8,10 @@
#include "fuse.h" #include "fuse.h"
#include "bootconfig.h" #include "bootconfig.h"
static bootconfig_t g_loaded_bootconfig = {0};
bool bootconfig_matches_hardware_info(void) { bool bootconfig_matches_hardware_info(void) {
uint32_t hardware_info[4]; uint32_t hardware_info[4];
fuse_get_hardware_info(hardware_info); fuse_get_hardware_info(hardware_info);
return memcmp(g_loaded_bootconfig.signed_config.hardware_info, hardware_info, sizeof(hardware_info)) == 0; return memcmp(LOADED_BOOTCONFIG->signed_config.hardware_info, hardware_info, sizeof(hardware_info)) == 0;
} }
void bootconfig_load_and_verify(const bootconfig_t *bootconfig) { void bootconfig_load_and_verify(const bootconfig_t *bootconfig) {
@ -35,49 +33,49 @@ void bootconfig_load_and_verify(const bootconfig_t *bootconfig) {
0x04, 0xFD, 0x69, 0xEA, 0x23, 0xB4, 0x6D, 0x16, 0x21, 0x98, 0x54, 0xB4, 0xDF, 0xE6, 0xAB, 0x93, 0x04, 0xFD, 0x69, 0xEA, 0x23, 0xB4, 0x6D, 0x16, 0x21, 0x98, 0x54, 0xB4, 0xDF, 0xE6, 0xAB, 0x93,
0x36, 0xB6, 0xD2, 0x43, 0xCF, 0x2B, 0x98, 0x1D, 0x45, 0xC9, 0xBB, 0x20, 0x42, 0xB1, 0x9D, 0x1D 0x36, 0xB6, 0xD2, 0x43, 0xCF, 0x2B, 0x98, 0x1D, 0x45, 0xC9, 0xBB, 0x20, 0x42, 0xB1, 0x9D, 0x1D
}; };
memcpy(&g_loaded_bootconfig, bootconfig, sizeof(bootconfig_t)); memcpy(LOADED_BOOTCONFIG, bootconfig, sizeof(bootconfig_t));
/* TODO: Should these restrictions be loosened for Exosphere? */ /* TODO: Should these restrictions be loosened for Exosphere? */
if (configitem_is_retail() if (configitem_is_retail()
|| se_rsa2048_pss_verify(g_loaded_bootconfig.signature, RSA_2048_BYTES, bootconfig_modulus, RSA_2048_BYTES, &g_loaded_bootconfig.signed_config, sizeof(g_loaded_bootconfig.signed_config)) != 0 || se_rsa2048_pss_verify(LOADED_BOOTCONFIG->signature, RSA_2048_BYTES, bootconfig_modulus, RSA_2048_BYTES, &LOADED_BOOTCONFIG->signed_config, sizeof(LOADED_BOOTCONFIG->signed_config)) != 0
|| !bootconfig_matches_hardware_info()) { || !bootconfig_matches_hardware_info()) {
/* Clear signed config. */ /* Clear signed config. */
memset(&g_loaded_bootconfig.signed_config, 0, sizeof(g_loaded_bootconfig.signed_config)); memset(&LOADED_BOOTCONFIG->signed_config, 0, sizeof(LOADED_BOOTCONFIG->signed_config));
} }
} }
void bootconfig_clear(void){ void bootconfig_clear(void){
memset(&g_loaded_bootconfig, 0, sizeof(bootconfig_t)); memset(LOADED_BOOTCONFIG, 0, sizeof(bootconfig_t));
} }
/* Actual configuration getters. */ /* Actual configuration getters. */
bool bootconfig_is_package2_plaintext(void) { bool bootconfig_is_package2_plaintext(void) {
return (g_loaded_bootconfig.signed_config.package2_config & 1) != 0; return (LOADED_BOOTCONFIG->signed_config.package2_config & 1) != 0;
} }
bool bootconfig_is_package2_unsigned(void) { bool bootconfig_is_package2_unsigned(void) {
return (g_loaded_bootconfig.signed_config.package2_config & 2) != 0; return (LOADED_BOOTCONFIG->signed_config.package2_config & 2) != 0;
} }
bool bootconfig_disable_program_verification(void) { bool bootconfig_disable_program_verification(void) {
return g_loaded_bootconfig.signed_config.disable_program_verification != 0; return LOADED_BOOTCONFIG->signed_config.disable_program_verification != 0;
} }
bool bootconfig_is_debug_mode(void) { bool bootconfig_is_debug_mode(void) {
return (g_loaded_bootconfig.unsigned_config.data[0x10] & 2) != 0; return (LOADED_BOOTCONFIG->unsigned_config.data[0x10] & 2) != 0;
} }
uint64_t bootconfig_get_memory_arrangement(void) { uint64_t bootconfig_get_memory_arrangement(void) {
if (bootconfig_is_debug_mode()) { if (bootconfig_is_debug_mode()) {
if (fuse_get_dram_id() == 4) { if (fuse_get_dram_id() == 4) {
if (g_loaded_bootconfig.unsigned_config.data[0x23]) { if (LOADED_BOOTCONFIG->unsigned_config.data[0x23]) {
return (uint64_t)(g_loaded_bootconfig.unsigned_config.data[0x23]); return (uint64_t)(LOADED_BOOTCONFIG->unsigned_config.data[0x23]);
} else { } else {
return 0x11ull; return 0x11ull;
} }
} else { } else {
if (g_loaded_bootconfig.unsigned_config.data[0x23]) { if (LOADED_BOOTCONFIG->unsigned_config.data[0x23]) {
if ((g_loaded_bootconfig.unsigned_config.data[0x23] & 0x30) == 0) { if ((LOADED_BOOTCONFIG->unsigned_config.data[0x23] & 0x30) == 0) {
return (uint64_t)(g_loaded_bootconfig.unsigned_config.data[0x23]); return (uint64_t)(LOADED_BOOTCONFIG->unsigned_config.data[0x23]);
} else { } else {
return 1ull; return 1ull;
} }
@ -94,13 +92,13 @@ uint64_t bootconfig_get_kernel_memory_configuration(void) {
if (bootconfig_is_debug_mode()) { if (bootconfig_is_debug_mode()) {
uint64_t high_val = 0; uint64_t high_val = 0;
if (fuse_get_dram_id() == 4) { if (fuse_get_dram_id() == 4) {
if (g_loaded_bootconfig.unsigned_config.data[0x23]) { if (LOADED_BOOTCONFIG->unsigned_config.data[0x23]) {
high_val = ((uint64_t)(g_loaded_bootconfig.unsigned_config.data[0x23]) >> 4) & 0x3; high_val = ((uint64_t)(LOADED_BOOTCONFIG->unsigned_config.data[0x23]) >> 4) & 0x3;
} else { } else {
high_val = 0x1; high_val = 0x1;
} }
} }
return (high_val << 16) | (((uint64_t)(g_loaded_bootconfig.unsigned_config.data[0x21])) << 8) | ((uint64_t)(g_loaded_bootconfig.unsigned_config.data[0x11])); return (high_val << 16) | (((uint64_t)(LOADED_BOOTCONFIG->unsigned_config.data[0x21])) << 8) | ((uint64_t)(LOADED_BOOTCONFIG->unsigned_config.data[0x11]));
} else { } else {
return 0ull; return 0ull;
} }

10
exosphere/src/bootconfig.h
View file

@ -3,9 +3,12 @@
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
#include "memory_map.h"
/* This provides management for Switch BootConfig. */ /* This provides management for Switch BootConfig. */
#define LOADED_BOOTCONFIG (get_loaded_bootconfig())
typedef struct { typedef struct {
uint8_t data[0x200]; uint8_t data[0x200];
} bootconfig_unsigned_config_t; } bootconfig_unsigned_config_t;
@ -23,9 +26,14 @@ typedef struct {
bootconfig_unsigned_config_t unsigned_config; bootconfig_unsigned_config_t unsigned_config;
uint8_t signature[0x100]; uint8_t signature[0x100];
bootconfig_signed_config_t signed_config; bootconfig_signed_config_t signed_config;
uint8_t unknown_config[0x240]; uint8_t unused_space[0x240]; /* remaining space in the evt page */
} bootconfig_t; } bootconfig_t;
static inline bootconfig_t *get_loaded_bootconfig(void) {
/* this is also get_exception_entry_stack_address(2) */
return (bootconfig_t *)(TZRAM_GET_SEGMENT_ADDRESS(TZRAM_SEGEMENT_ID_SECMON_EVT) + 0x180);
}
void bootconfig_load_and_verify(const bootconfig_t *bootconfig); void bootconfig_load_and_verify(const bootconfig_t *bootconfig);
void bootconfig_clear(void); void bootconfig_clear(void);