all: Use bool where applicable (#30)

This commit is contained in:
Mat M
2018-02-22 22:58:39 -05:00
committed by SciresM
parent 1d8f443f68
commit 83216409d2
15 changed files with 154 additions and 145 deletions

View File

@@ -7,10 +7,10 @@ uint64_t g_secure_page_user_address = NULL;
/* Create a user page reference for the desired address. */
/* Returns 1 on success, 0 on failure. */
int upage_init(upage_ref_t *upage, void *user_address) {
bool upage_init(upage_ref_t *upage, void *user_address) {
upage->user_page = get_page_for_address(user_address);
upage->secure_page = 0ULL;
if (g_secure_page_user_address != NULL) {
/* Different physical address indicate SPL was rebooted, or another process got access to svcCallSecureMonitor. Panic. */
if (g_secure_page_user_address != upage->user_page) {
@@ -25,38 +25,38 @@ int upage_init(upage_ref_t *upage, void *user_address) {
upage->secure_page = SECURE_USER_PAGE_ADDR;
}
}
return upage->secure_page != 0ULL;
}
int user_copy_to_secure(upage_ref_t *upage, void *secure_dst, void *user_src, size_t size) {
bool user_copy_to_secure(upage_ref_t *upage, void *secure_dst, void *user_src, size_t size) {
/* Fail if the page doesn't match. */
if (get_page_for_address(user_src) != upage->user_page) {
return 0;
return false;
}
/* Fail if we go past the page boundary. */
if (size != 0 && get_page_for_address(user_src + size - 1) != upage->user_page) {
return 0;
return false;
}
void *secure_src = (void *)(upage->secure_page + ((uint64_t)user_src - upage->user_page));
memcpy(secure_dst, secure_src, size);
return 1;
return true;
}
int secure_copy_to_user(upage_ref_t *upage, void *user_dst, void *secure_src, size_t size) {
bool secure_copy_to_user(upage_ref_t *upage, void *user_dst, void *secure_src, size_t size) {
/* Fail if the page doesn't match. */
if (get_page_for_address(user_dst) != upage->user_page) {
return 0;
return false;
}
/* Fail if we go past the page boundary. */
if (size != 0 && get_page_for_address(user_dst + size - 1) != upage->user_page) {
return 0;
return false;
}
void *secure_dst = (void *)(upage->secure_page + ((uint64_t)user_dst - upage->user_page));
memcpy(secure_dst, secure_src, size);
return 1;
return true;
}