mirror/uvm32
1
Fork 0
mirror of https://github.com/ringtailsoftware/uvm32.git synced 2026-06-06 06:53:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add test for reading slice in extram which is out of bounds

Browse source
This commit is contained in:
Toby Jaffey 2025-12-13 23:10:49 +00:00
parent 18d787a7b9
commit b083008d7b
3 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/extram/rom/rom.c
View file

@ -49,7 +49,7 @@ void main(void) {
p[2] = 'l'; p[2] = 'l';
p[3] = 'l'; p[3] = 'l';
p[4] = 'o'; p[4] = 'o';
printbuf(p, 5); // try to print from extram (unterminated) printbuf(p, 5); // try to print from extram (slice)
} break; } break;
case TEST10: { case TEST10: {
uint8_t *p = (uint8_t *)UVM32_EXTRAM_BASE; uint8_t *p = (uint8_t *)UVM32_EXTRAM_BASE;
@ -69,6 +69,10 @@ void main(void) {
// pass a string beyond end of MMIO region // pass a string beyond end of MMIO region
println((uint32_t)UVM32_EXTRAM_BASE + 8); // extram has been shrunk, this is now out of bounds, or no terminator found println((uint32_t)UVM32_EXTRAM_BASE + 8); // extram has been shrunk, this is now out of bounds, or no terminator found
} break; } break;
case TEST13: {
// pass a slice beyond end of extram
printbuf((uint32_t)UVM32_EXTRAM_BASE + 32, 64); // extram has been shrunk, this is now out of bounds,
} break;
} }
} }

1
test/extram/shared.h
View file

@ -14,5 +14,6 @@ enum {
TEST10, TEST10,
TEST11, TEST11,
TEST12, TEST12,
TEST13,
}; };

14
test/extram/test/tests.c
View file

@ -189,7 +189,7 @@ void test_extram_short_read(void) {
TEST_ASSERT_EQUAL(0xCDEF, uvm32_arg_getval(&vmst, &evt, ARG0)); TEST_ASSERT_EQUAL(0xCDEF, uvm32_arg_getval(&vmst, &evt, ARG0));
} }
void test_extram_buf_unterminated(void) { void test_extram_buf_slice(void) {
// run the vm // run the vm
uvm32_run(&vmst, &evt, 100); uvm32_run(&vmst, &evt, 100);
TEST_ASSERT_EQUAL(false, uvm32_extramDirty(&vmst)); TEST_ASSERT_EQUAL(false, uvm32_extramDirty(&vmst));
@ -256,7 +256,7 @@ void test_extram_buf_terminated_rugpull(void) {
TEST_ASSERT_EQUAL(evt.data.err.errcode, UVM32_ERR_MEM_RD); TEST_ASSERT_EQUAL(evt.data.err.errcode, UVM32_ERR_MEM_RD);
} }
void test_extram_buf_unterminated_rugpull(void) { void test_extram_buf_slice_rugpull(void) {
// run the vm // run the vm
uvm32_run(&vmst, &evt, 100); uvm32_run(&vmst, &evt, 100);
TEST_ASSERT_EQUAL(false, uvm32_extramDirty(&vmst)); TEST_ASSERT_EQUAL(false, uvm32_extramDirty(&vmst));
@ -337,7 +337,7 @@ void test_extram_buf_terminated_beyond_extram_end_oobstart(void) {
TEST_ASSERT_EQUAL(evt.data.err.errcode, UVM32_ERR_MEM_RD); TEST_ASSERT_EQUAL(evt.data.err.errcode, UVM32_ERR_MEM_RD);
} }
void test_extram_buf_terminated_beyond_extram_end(void) { void test_extram_buf_slice_beyond_extram_end(void) {
// run the vm // run the vm
uvm32_run(&vmst, &evt, 100); uvm32_run(&vmst, &evt, 100);
TEST_ASSERT_EQUAL(false, uvm32_extramDirty(&vmst)); TEST_ASSERT_EQUAL(false, uvm32_extramDirty(&vmst));
@ -345,13 +345,13 @@ void test_extram_buf_terminated_beyond_extram_end(void) {
// check for picktest syscall // check for picktest syscall
TEST_ASSERT_EQUAL(evt.typ, UVM32_EVT_SYSCALL); TEST_ASSERT_EQUAL(evt.typ, UVM32_EVT_SYSCALL);
TEST_ASSERT_EQUAL(evt.data.syscall.code, SYSCALL_PICKTEST); TEST_ASSERT_EQUAL(evt.data.syscall.code, SYSCALL_PICKTEST);
uvm32_arg_setval(&vmst, &evt, RET, TEST12); uvm32_arg_setval(&vmst, &evt, RET, TEST13);
uvm32_run(&vmst, &evt, 100); uvm32_run(&vmst, &evt, 100);
TEST_ASSERT_EQUAL(false, uvm32_extramDirty(&vmst)); TEST_ASSERT_EQUAL(false, uvm32_extramDirty(&vmst));
// check for printbuf of val // check for printbuf of val
TEST_ASSERT_EQUAL(UVM32_EVT_SYSCALL, evt.typ); TEST_ASSERT_EQUAL(UVM32_EVT_SYSCALL, evt.typ);
TEST_ASSERT_EQUAL(evt.data.syscall.code, UVM32_SYSCALL_PRINTLN); TEST_ASSERT_EQUAL(evt.data.syscall.code, UVM32_SYSCALL_PRINTBUF);
// replace extram with a tiny one, so read is off the end // replace extram with a tiny one, so read is off the end
uint32_t r[3]; uint32_t r[3];
@ -362,8 +362,8 @@ void test_extram_buf_terminated_beyond_extram_end(void) {
// string starts in valid extram, but no terminator will be found before hitting end of extram // string starts in valid extram, but no terminator will be found before hitting end of extram
// check that reading from non-existent extram gives empty string and puts into err state // check that reading from non-existent extram gives empty string and puts into err state
const char *str = uvm32_arg_getcstr(&vmst, &evt, ARG0); uvm32_slice_t buf = uvm32_arg_getbuf(&vmst, &evt, ARG0, ARG1);
TEST_ASSERT_EQUAL(0, strlen(str)); TEST_ASSERT_EQUAL(0, buf.len);
uvm32_run(&vmst, &evt, 100); uvm32_run(&vmst, &evt, 100);
TEST_ASSERT_EQUAL(evt.typ, UVM32_EVT_ERR); TEST_ASSERT_EQUAL(evt.typ, UVM32_EVT_ERR);
TEST_ASSERT_EQUAL(evt.data.err.errcode, UVM32_ERR_MEM_RD); TEST_ASSERT_EQUAL(evt.data.err.errcode, UVM32_ERR_MEM_RD);