Skip to content

Commit

Permalink
Cleaner trace disabling during disk mounting
Browse files Browse the repository at this point in the history
Signed-off-by: Christoph M. Wintersteiger <[email protected]>
  • Loading branch information
Christoph M. Wintersteiger committed Sep 15, 2020
1 parent 5792163 commit c83e7f5
Showing 1 changed file with 13 additions and 15 deletions.
28 changes: 13 additions & 15 deletions src/lkl/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ static void lkl_prepare_rootfs(const char* dirname, int perm)
{
lkl_sys_chmod(dirname, perm);
}

}

static void lkl_copy_blkdev_nodes(const char* srcdir, const char* dstdir)
Expand Down Expand Up @@ -630,17 +629,17 @@ static void lkl_mount_disk(
}

const sgxlkl_trace_config_t* tcfg = &sgxlkl_enclave_state.config->trace;
bool syscall_traces_enabled =
sgxlkl_enclave_state.trace_enabled.lkl_syscall ||
sgxlkl_enclave_state.trace_enabled.internal_syscall;

const int lkl_trace_lkl_syscall_bak = tcfg->lkl_syscall;
const int lkl_trace_internal_syscall_bak = tcfg->internal_syscall;

if ((tcfg->lkl_syscall || tcfg->internal_syscall) &&
(disk->roothash || is_encrypted_cfg(disk)))
if (disk->roothash || is_encrypted_cfg(disk))
{
if (syscall_traces_enabled)
SGXLKL_VERBOSE("Disk encryption/integrity enabled: Temporarily "
"disabling tracing to reduce noise.\n");
sgxlkl_enclave_state.trace_enabled.lkl_syscall = false;
sgxlkl_enclave_state.trace_enabled.internal_syscall = false;
SGXLKL_VERBOSE("Disk encryption/integrity enabled: Temporarily "
"disabling tracing to reduce noise.\n");
}

if (disk->roothash != NULL)
Expand Down Expand Up @@ -681,15 +680,14 @@ static void lkl_mount_disk(
dev_str = dev_str_enc;
}

if ((lkl_trace_lkl_syscall_bak && !tcfg->lkl_syscall) ||
(lkl_trace_internal_syscall_bak && !tcfg->internal_syscall))
if (disk->roothash || is_encrypted_cfg(disk))
{
SGXLKL_VERBOSE(
"Disk encryption/integrity enabled: Re-enabling tracing.\n");
sgxlkl_enclave_state.trace_enabled.lkl_syscall =
lkl_trace_lkl_syscall_bak;
if (syscall_traces_enabled)
SGXLKL_VERBOSE(
"Disk encryption/integrity enabled: Re-enabling tracing.\n");
sgxlkl_enclave_state.trace_enabled.lkl_syscall = tcfg->lkl_syscall;
sgxlkl_enclave_state.trace_enabled.internal_syscall =
lkl_trace_internal_syscall_bak;
tcfg->internal_syscall;
}

if (disk->create)
Expand Down

0 comments on commit c83e7f5

Please sign in to comment.