diff options
| author | cinap_lenrek <cinap_lenrek@felloff.net> | 2014-03-04 22:37:15 +0100 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2014-03-04 22:37:15 +0100 |
| commit | 316d8ad76b13583848db2d93187a921c18ee275c (patch) | |
| tree | d0f5c3b98606ab42bbb31f3b952ba30c607df294 /sys/src/9/port/segment.c | |
| parent | 06c8a5b3911239937e0c99634e25cfc7209df436 (diff) | |
pc64: fix segattach
the comment about Physseg.size being in pages is wrong,
change type to uintptr and correct the comment.
change the length parameter of segattach() and isoverlap()
to uintptr as well. segments can grow over 4GB in pc64 now
and globalsegattach() in devsegment calculates len argument
of isoverlap() by s->top - s->bot. note that the syscall
still takes 32bit ulong argument for the length!
check for integer overflow in segattach(), make sure segment
goes not beyond USTKTOP.
change PTEMAPMEM constant to uvlong as it is used to calculate
SEGMAXSIZE.
Diffstat (limited to 'sys/src/9/port/segment.c')
| -rw-r--r-- | sys/src/9/port/segment.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sys/src/9/port/segment.c b/sys/src/9/port/segment.c index c73698b9e..735c876b4 100644 --- a/sys/src/9/port/segment.c +++ b/sys/src/9/port/segment.c @@ -558,7 +558,7 @@ out: } Segment* -isoverlap(Proc *p, uintptr va, int len) +isoverlap(Proc *p, uintptr va, uintptr len) { int i; Segment *ns; @@ -621,7 +621,7 @@ isphysseg(char *name) } uintptr -segattach(Proc *p, ulong attr, char *name, uintptr va, ulong len) +segattach(Proc *p, ulong attr, char *name, uintptr va, uintptr len) { int sno; Segment *s, *os; @@ -671,13 +671,12 @@ segattach(Proc *p, ulong attr, char *name, uintptr va, ulong len) error(Enovmem); va -= len; } - va &= ~(BY2PG-1); - } else { - va &= ~(BY2PG-1); - if(va == 0 || va >= USTKTOP) - error(Ebadarg); } + va &= ~(BY2PG-1); + if(va == 0 || (va+len) > USTKTOP || (va+len) < va) + error(Ebadarg); + if(isoverlap(p, va, len) != nil) error(Esoverlap); |