ilo-pona/xv6-65oo2
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Activity

Merge branch 'riscv' of g.csail.mit.edu:xv6-dev into riscv

Browse source
This commit is contained in:
Robert Morris 2020-09-30 17:16:05 -04:00
parent 2055fe13ac 05074badc4
commit 788b4d1bc9
2 changed files with 50 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kernel/fs.c
View file

@ -468,6 +468,7 @@ readi(struct inode *ip, int user_dst, uint64 dst, uint off, uint n)
m = min(n - tot, BSIZE - off%BSIZE);
if(either_copyout(user_dst, dst, bp->data + (off % BSIZE), m) == -1) {
brelse(bp);
tot = -1;
break;
}
brelse(bp);
@ -495,6 +496,7 @@ writei(struct inode *ip, int user_src, uint64 src, uint off, uint n)
m = min(n - tot, BSIZE - off%BSIZE);
if(either_copyin(bp->data + (off % BSIZE), user_src, src, m) == -1) {
brelse(bp);
n = -1;
break;
}
log_write(bp);

48
user/usertests.c
View file

@ -233,6 +233,53 @@ copyinstr3(char *s)
}
}
// See if the kernel refuses to read/write user memory that the
// application doesn't have anymore, because it returned it.
void
rwsbrk()
{
int fd, n;
uint64 a = (uint64) sbrk(8192);
if(a == 0xffffffffffffffffLL) {
printf("sbrk(rwsbrk) failed\n");
exit(1);
}
if ((uint64) sbrk(-8192) == 0xffffffffffffffffLL) {
printf("sbrk(rwsbrk) shrink failed\n");
exit(1);
}
fd = open("rwsbrk", O_CREATE|O_WRONLY);
if(fd < 0){
printf("open(rwsbrk) failed\n");
exit(1);
}
n = write(fd, (void*)(a+4096), 1024);
if(n >= 0){
printf("write(fd, %p, 1024) returned %d, not -1\n", a+4096, n);
exit(1);
}
close(fd);
unlink("rwsbrk");
fd = open("README", O_RDONLY);
if(fd < 0){
printf("open(rwsbrk) failed\n");
exit(1);
}
n = read(fd, (void*)(a+4096), 10);
if(n >= 0){
printf("read(fd, %p, 10) returned %d, not -1\n", a+4096, n);
exit(1);
}
close(fd);
exit(0);
}
// test O_TRUNC.
void
truncate1(char *s)
@ -2644,6 +2691,7 @@ main(int argc, char *argv[])
{copyinstr1, "copyinstr1"},
{copyinstr2, "copyinstr2"},
{copyinstr3, "copyinstr3"},
{rwsbrk, "rwsbrk" },
{truncate1, "truncate1"},
{truncate2, "truncate2"},
{truncate3, "truncate3"},