Skip to content

Fix some failing tests #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ltratt merged 1 commit into from
Jan 16, 2025
Merged

Fix some failing tests #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions general_bounds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ int main(int argc, char *argv[])

printf("Explicitly setting the bounds outside the range causes the following exception: ");
fflush(stdout);
int32_t custom_bounds_array = cheri_setbounds(array, bounds);
int32_t *custom_bounds_array = cheri_setbounds(array, bounds);
#else
#error Platform not currently supported.
#endif
}
}
4 changes: 2 additions & 2 deletions hybrid/compartment_examples/inter_comp_call/base/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ void executive_switch(struct comp c)
void *__capability comps_addr = (void *__capability) &comps;
comps_addr = cheri_bounds_set(comps_addr, COMP_COUNT * COMP_SIZE);

asm("mov c19, %w0\n\t"
"mov c20, %w1\n\t"
asm("mov c19, %C0\n\t"
"mov c20, %C1\n\t"
"mov x0, #0\n\t"
"msr CID_EL0, c0"
:
Expand Down
2 changes: 1 addition & 1 deletion ...id/compartment_examples/inter_comp_call/malicious_compartments/secure-redirect_clr/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ void init_comps()

switcher_call = (void *__capability) switcher_caps;
// Seal this capability to be only used via a `lpb` type call
asm("seal %w0, %w0, lpb" : "+r"(switcher_call) :);
asm("seal %C0, %C0, lpb" : "+r"(switcher_call) :);
}

void add_comp(uint8_t *_start_addr, void (*_comp_fn)(), void *_comp_fn_end)
Expand Down
2 changes: 1 addition & 1 deletion hybrid/compartment_examples/inter_comp_call/malicious_compartments/secure-try_deref/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ void init_comps()

switcher_call = (void *__capability) switcher_caps;
// Seal this capability to be only used via a `lpb` type call
asm("seal %w0, %w0, lpb" : "+r"(switcher_call) :);
asm("seal %C0, %C0, lpb" : "+r"(switcher_call) :);
}

void add_comp(uint8_t *_start_addr, void (*_comp_fn)(), void *_comp_fn_end)
Expand Down
2 changes: 1 addition & 1 deletion hybrid/compartment_examples/inter_comp_call/malicious_compartments/secure-update_ddc/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ void init_comps()

switcher_call = (void *__capability) switcher_caps;
// Seal this capability to be only used via a `lpb` type call
asm("seal %w0, %w0, lpb" : "+r"(switcher_call) :);
asm("seal %C0, %C0, lpb" : "+r"(switcher_call) :);
}

void add_comp(uint8_t *_start_addr, void (*_comp_fn)(), void *_comp_fn_end)
Expand Down
2 changes: 1 addition & 1 deletion hybrid/compartment_examples/inter_comp_call/malicious_compartments/secure/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ void init_comps()

switcher_call = (void *__capability) switcher_caps;
// Seal this capability to be only used via a `lpb` type call
asm("seal %w0, %w0, lpb" : "+r"(switcher_call) :);
asm("seal %C0, %C0, lpb" : "+r"(switcher_call) :);
}

void add_comp(uint8_t *_start_addr, void (*_comp_fn)(), void *_comp_fn_end)
Expand Down
Loading