Bricoles/xv6-riscv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

slightly more thorough testing that one can't write invalid addresses

Browse source
This commit is contained in:
Robert Morris 2024-01-01 16:10:02 -05:00
parent fe940f4d63
commit 5a1a4d45a4
1 changed files with 32 additions and 22 deletions

54
user/usertests.c
View file

@ -32,9 +32,10 @@ char buf[BUFSZ];
void void
copyin(char *s) copyin(char *s)
{ {
uint64 addrs[] = { 0x80000000LL, 0xffffffffffffffff }; uint64 addrs[] = { 0x80000000LL, 0x3fffffe000, 0x3ffffff000, 0x4000000000,
0xffffffffffffffff };
for(int ai = 0; ai < 2; ai++){ for(int ai = 0; ai < sizeof(addrs)/sizeof(addrs[0]); ai++){
uint64 addr = addrs[ai]; uint64 addr = addrs[ai];
int fd = open("copyin1", O_CREATE|O_WRONLY); int fd = open("copyin1", O_CREATE|O_WRONLY);
@ -76,9 +77,10 @@ copyin(char *s)
void void
copyout(char *s) copyout(char *s)
{ {
uint64 addrs[] = { 0LL, 0x80000000LL, 0xffffffffffffffff }; uint64 addrs[] = { 0LL, 0x80000000LL, 0x3fffffe000, 0x3ffffff000, 0x4000000000,
0xffffffffffffffff };
for(int ai = 0; ai < 2; ai++){ for(int ai = 0; ai < sizeof(addrs)/sizeof(addrs[0]); ai++){
uint64 addr = addrs[ai]; uint64 addr = addrs[ai];
int fd = open("README", 0); int fd = open("README", 0);
@ -117,9 +119,10 @@ copyout(char *s)
void void
copyinstr1(char *s) copyinstr1(char *s)
{ {
uint64 addrs[] = { 0x80000000LL, 0xffffffffffffffff }; uint64 addrs[] = { 0x80000000LL, 0x3fffffe000, 0x3ffffff000, 0x4000000000,
0xffffffffffffffff };
for(int ai = 0; ai < 2; ai++){ for(int ai = 0; ai < sizeof(addrs)/sizeof(addrs[0]); ai++){
uint64 addr = addrs[ai]; uint64 addr = addrs[ai];
int fd = open((char *)addr, O_CREATE|O_WRONLY); int fd = open((char *)addr, O_CREATE|O_WRONLY);
@ -2421,27 +2424,34 @@ stacktest(char *s)
exit(xstatus); exit(xstatus);
} }
// check that writes to text segment fault // check that writes to a few forbidden addresses
// cause a fault, e.g. process's text and TRAMPOLINE.
void void
textwrite(char *s) nowrite(char *s)
{ {
int pid; int pid;
int xstatus; int xstatus;
uint64 addrs[] = { 0, 0x80000000LL, 0x3fffffe000, 0x3ffffff000, 0x4000000000,
0xffffffffffffffff };
pid = fork(); for(int ai = 0; ai < sizeof(addrs)/sizeof(addrs[0]); ai++){
if(pid == 0) { pid = fork();
volatile int *addr = (int *) 0; if(pid == 0) {
*addr = 10; volatile int *addr = (int *) addrs[ai];
exit(1); *addr = 10;
} else if(pid < 0){ printf("%s: write to %p did not fail!\n", s, addr);
printf("%s: fork failed\n", s); exit(0);
exit(1); } else if(pid < 0){
printf("%s: fork failed\n", s);
exit(1);
}
wait(&xstatus);
if(xstatus == 0){
// kernel did not kill child!
exit(1);
}
} }
wait(&xstatus); exit(0);
if(xstatus == -1) // kernel killed child?
exit(0);
else
exit(xstatus);
} }
// regression test. copyin(), copyout(), and copyinstr() used to cast // regression test. copyin(), copyout(), and copyinstr() used to cast
@ -2629,7 +2639,7 @@ struct test {
{bigargtest, "bigargtest"}, {bigargtest, "bigargtest"},
{argptest, "argptest"}, {argptest, "argptest"},
{stacktest, "stacktest"}, {stacktest, "stacktest"},
{textwrite, "textwrite"}, {nowrite, "nowrite"},
{pgbug, "pgbug" }, {pgbug, "pgbug" },
{sbrkbugs, "sbrkbugs" }, {sbrkbugs, "sbrkbugs" },
{sbrklast, "sbrklast"}, {sbrklast, "sbrklast"},