cirno/plan9front
1
0
Fork 0
mirror of git://git.9front.org/plan9front/plan9front synced 2025-01-12 11:10:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kernel: make trap() handlers consistent and check for stack overflow in kenter() for all archs

Browse source
This commit is contained in:
cinap_lenrek 2024-01-20 17:26:39 +00:00
parent 1a73b594e6
commit 4364b71ccc
18 changed files with 83 additions and 210 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sys/src/9/arm64/trap.c
View file

@ -226,7 +226,6 @@ syscall(Ureg *ureg)
}
if(scallnr >= nsyscall || systab[scallnr] == nil){
pprint("bad sys call number %lud pc %#p", scallnr, ureg->pc);
postnote(up, 1, "sys: bad sys call", NDebug);
error(Ebadarg);
}

14
sys/src/9/bcm/trap.c
View file

@ -136,20 +136,6 @@ trap(Ureg *ureg)
uintptr va;
char buf[ERRMAX];
assert(!islo());
if(up != nil)
rem = ((char*)ureg)-((char*)up - KSTACK);
else
rem = ((char*)ureg)-((char*)m+sizeof(Mach));
if(rem < 256) {
iprint("trap: %d stack bytes left, up %#p ureg %#p at pc %#lux\n",
rem, up, ureg, ureg->pc);
delay(1000);
dumpstack();
panic("trap: %d stack bytes left, up %#p ureg %#p at pc %#lux",
rem, up, ureg, ureg->pc);
}
user = kenter(ureg);
/*
* All interrupts/exceptions should be resumed at ureg->pc-4,

17
sys/src/9/cycv/trap.c
View file

@ -237,8 +237,7 @@ syscall(Ureg *ureg)
startns = todget(nil);
}
if(scallnr >= nsyscall || systab[scallnr] == 0){
pprint("bad sys call number %lud pc %lux", scallnr, ureg->pc);
if(scallnr >= nsyscall || systab[scallnr] == nil){
postnote(up, 1, "sys: bad sys call", NDebug);
error(Ebadarg);
}
@ -272,14 +271,14 @@ syscall(Ureg *ureg)
if(scallnr == NOTED)
noted(ureg, *((ulong *) up->s.args));
if(scallnr != RFORK && (up->procctl || up->nnote)){
splhi();
notify(ureg);
}
if(up->delaysched)
sched();
kexit(ureg);
splhi();
if(scallnr != RFORK && (up->procctl || up->nnote))
notify(ureg);
if(up->delaysched){
sched();
splhi();
}
kexit(ureg);
}
int

7
sys/src/9/kw/syscall.c
View file

@ -188,16 +188,11 @@ syscall(Ureg* ureg)
splx(s);
startns = todget(nil);
}
if(scallnr >= nsyscall){
pprint("bad sys call number %d pc %#lux\n",
scallnr, ureg->pc);
if(scallnr >= nsyscall || systab[scallnr] == nil){
postnote(up, 1, "sys: bad sys call", NDebug);
error(Ebadarg);
}
up->psstate = sysctab[scallnr];
/* iprint("%s: syscall %s\n", up->text, sysctab[scallnr]?sysctab[scallnr]:"huh?"); */
ret = systab[scallnr]((va_list)up->s.args);
poperror();
}else{

11
sys/src/9/kw/trap.c
View file

@ -193,6 +193,7 @@ intrs(Ureg *ur, int sort)
Handler *h;
Irq irq;
m->perf.intrts = perfticks();
clockintr = 0;
assert(sort >= 0 && sort < nelem(irqs));
@ -370,16 +371,6 @@ trap(Ureg *ureg)
uintptr va;
char buf[ERRMAX];
if(up != nil)
rem = (char*)ureg - ((char*)up - KSTACK);
else
rem = (char*)ureg - ((char*)m + sizeof(Mach));
if(rem < 256) {
dumpstack();
panic("trap %d bytes remaining, up %#p ureg %#p at pc %#lux",
rem, up, ureg, ureg->pc);
}
user = kenter(ureg);
if(ureg->type == PsrMabt+1)
ureg->pc -= 8;

25
sys/src/9/mt7688/syscall.c
View file

@ -42,17 +42,12 @@ syscall(Ureg* ureg)
ret = -1;
if(!waserror()){
if(sp < (USTKTOP-BY2PG) || sp > (USTKTOP-sizeof(Sargs)))
validaddr(sp, sizeof(Sargs), 0);
if(scallnr >= nsyscall){
iprint("bad sys call number %lud pc %#lux\n",
scallnr, ureg->pc);
postnote(up, 1, "sys: bad sys call", NDebug);
error(Ebadarg);
}
up->s = *((Sargs*)(sp)); /* spim's libc is different to mips ... */
if(up->procctl == Proc_tracesyscall){
iprint("tracesyscall\n");
delay(50);
syscallfmt(scallnr, ureg->pc, (va_list)up->s.args);
s = splhi();
up->procctl = Proc_stopme;
@ -61,16 +56,11 @@ syscall(Ureg* ureg)
startns = todget(nil);
}
if(sp < (USTKTOP-BY2PG) || sp > (USTKTOP-sizeof(Sargs)))
validaddr(sp, sizeof(Sargs), 0);
up->s = *((Sargs*)(sp)); /* spim's libc is different to mips ... */
if(scallnr >= nsyscall || systab[scallnr] == nil){
postnote(up, 1, "sys: bad sys call", NDebug);
error(Ebadarg);
}
up->psstate = sysctab[scallnr];
// iprint("[%luX] %s: syscall %s\n", (ulong)&ureg, up->text, sysctab[scallnr]?sysctab[scallnr]:"huh?");
// delay(20);
// dumpregs(ureg);
ret = systab[scallnr]((va_list)up->s.args);
poperror();
}else{
@ -120,6 +110,7 @@ syscall(Ureg* ureg)
/* if we delayed sched because we held a lock, sched now */
if(up->delaysched){
sched();
splhi();
}
kexit(ureg);

13
sys/src/9/mt7688/trap.c
View file

@ -152,19 +152,6 @@ trap(Ureg *ur)
char buf[2*ERRMAX], buf1[ERRMAX], *fpexcep;
static int dumps;
if (up && (char *)(ur) - ((char *)up - KSTACK) < 1024 && dumps++ == 0) {
iprint("trap: proc %ld kernel stack getting full\n", up->pid);
dumpregs(ur);
dumpstack();
for(;;);
}
if (up == nil &&
(char *)(ur) - (char *)m->stack < 1024 && dumps++ == 0) {
iprint("trap: cpu%d kernel stack getting full\n", m->machno);
dumpregs(ur);
dumpstack();
for(;;);
}
user = kenter(ur);
if (ur->cause & TS)
panic("trap: tlb shutdown");

12
sys/src/9/mtx/trap.c
View file

@ -613,18 +613,16 @@ syscall(Ureg* ureg)
up->nerrlab = 0;
ret = -1;
if(!waserror()){
if(scallnr >= nsyscall || systab[scallnr] == nil){
pprint("bad sys call number %d pc %lux\n", scallnr, ureg->pc);
postnote(up, 1, "sys: bad sys call", NDebug);
error(Ebadarg);
}
if(sp<(USTKTOP-BY2PG) || sp>(USTKTOP-sizeof(Sargs)-BY2WD))
validaddr(sp, sizeof(Sargs)+BY2WD, 0);
up->s = *((Sargs*)(sp+BY2WD));
up->psstate = sysctab[scallnr];
if(scallnr >= nsyscall || systab[scallnr] == nil){
postnote(up, 1, "sys: bad sys call", NDebug);
error(Ebadarg);
}
up->psstate = sysctab[scallnr];
ret = systab[scallnr](up->s.args);
poperror();
}else{

14
sys/src/9/omap/syscall.c
View file

@ -181,21 +181,15 @@ syscall(Ureg* ureg)
up->nerrlab = 0;
ret = -1;
if(!waserror()){
if(scallnr >= nsyscall){
pprint("bad sys call number %d pc %#lux\n",
scallnr, ureg->pc);
postnote(up, 1, "sys: bad sys call", NDebug);
error(Ebadarg);
}
if(sp < (USTKTOP-BY2PG) || sp > (USTKTOP-sizeof(Sargs)-BY2WD))
validaddr(sp, sizeof(Sargs)+BY2WD, 0);
up->s = *((Sargs*)(sp+BY2WD));
if(scallnr >= nsyscall || systab[scallnr] == nil){
postnote(up, 1, "sys: bad sys call", NDebug);
error(Ebadarg);
}
up->psstate = sysctab[scallnr];
/* iprint("%s: syscall %s\n", up->text, sysctab[scallnr]?sysctab[scallnr]:"huh?"); */
ret = systab[scallnr]((va_list)up->s.args);
poperror();
}else{

14
sys/src/9/omap/trap.c
View file

@ -451,20 +451,6 @@ trap(Ureg *ureg)
uintptr va;
char buf[ERRMAX];
splhi(); /* paranoia */
if(up != nil)
rem = ((char*)ureg)-((char*)up-KSTACK);
else
rem = ((char*)ureg)-((char*)m+sizeof(Mach));
if(rem < 1024) {
iprint("trap: %d stack bytes left, up %#p ureg %#p at pc %#lux\n",
rem, up, ureg, ureg->pc);
delay(1000);
dumpstack();
panic("trap: %d stack bytes left, up %#p ureg %#p at pc %#lux",
rem, up, ureg, ureg->pc);
}
user = kenter(ureg);
/*
* All interrupts/exceptions should be resumed at ureg->pc-4,

18
sys/src/9/pc/trap.c
View file

@ -382,14 +382,11 @@ debugexc(Ureg *ureg, void *)
static void
debugbpt(Ureg* ureg, void*)
{
char buf[ERRMAX];
if(up == 0)
panic("kernel bpt");
/* restore pc to instruction that caused the trap */
ureg->pc--;
sprint(buf, "sys: breakpoint");
postnote(up, 1, buf, NDebug);
postnote(up, 1, "sys: breakpoint", NDebug);
}
static void
@ -500,9 +497,7 @@ syscall(Ureg* ureg)
startns = todget(nil);
}
if(scallnr >= nsyscall || systab[scallnr] == 0){
pprint("bad sys call number %lud pc %lux\n",
scallnr, ureg->pc);
if(scallnr >= nsyscall || systab[scallnr] == nil){
postnote(up, 1, "sys: bad sys call", NDebug);
error(Ebadarg);
}
@ -548,13 +543,14 @@ syscall(Ureg* ureg)
if(scallnr == NOTED)
noted(ureg, *((ulong*)up->s.args));
if(scallnr!=RFORK && (up->procctl || up->nnote)){
splhi();
splhi();
if(scallnr!=RFORK && (up->procctl || up->nnote))
notify(ureg);
}
/* if we delayed sched because we held a lock, sched now */
if(up->delaysched)
if(up->delaysched){
sched();
splhi();
}
kexit(ureg);
}

13
sys/src/9/port/proc.c
View file

@ -111,6 +111,19 @@ kenter(Ureg *ureg)
if(user){
up->dbgreg = ureg;
cycles(&up->kentry);
} else {
int rem;
if((uchar*)&ureg < (uchar*)ureg){
/* stack grows down */
rem = (int)((uintptr)ureg - (up!=nil? (uintptr)up - KSTACK: (uintptr)m->stack));
} else {
/* stack grows up */
rem = (int)((up!=nil? (uintptr)up: (uintptr)m + MACHSIZE) - (uintptr)ureg);
}
if(rem < 256)
panic("kenter: %d stack bytes left, up %#p ureg %#p at pc %#p",
rem, up, ureg, ureg->pc);
}
return user;
}

14
sys/src/9/ppc/trap.c
View file

@ -282,9 +282,6 @@ trap(Ureg *ureg)
splhi();
if(user) {
if (up->fpstate == FPactive && (ureg->srr1 & MSR_FP) == 0){
postnote(up, 1, buf, NDebug);
}
notify(ureg);
if(up->fpstate != FPactive)
ureg->srr1 &= ~MSR_FP;
@ -600,18 +597,15 @@ syscall(Ureg* ureg)
up->nerrlab = 0;
ret = -1;
if(!waserror()){
if(scallnr >= nsyscall || systab[scallnr] == nil){
pprint("bad sys call number %d pc %lux\n", scallnr, ureg->pc);
postnote(up, 1, "sys: bad sys call", NDebug);
error(Ebadarg);
}
if(sp<(USTKTOP-BY2PG) || sp>(USTKTOP-sizeof(Sargs)-BY2WD))
validaddr(sp, sizeof(Sargs)+BY2WD, 0);
up->s = *((Sargs*)(sp+BY2WD));
if(scallnr >= nsyscall || systab[scallnr] == nil){
postnote(up, 1, "sys: bad sys call", NDebug);
error(Ebadarg);
}
up->psstate = sysctab[scallnr];
ret = systab[scallnr]((va_list)up->s.args);
poperror();
}else{

31
sys/src/9/sgi/trap.c
View file

@ -158,21 +158,7 @@ trap(Ureg *ur)
int ecode, user, cop, x, fpchk;
ulong fpfcr31;
char buf[2*ERRMAX], buf1[ERRMAX], *fpexcep;
static int dumps;
if (up && (char *)(ur) - ((char *)up - KSTACK) < 1024 && dumps++ == 0) {
iprint("trap: proc %ld kernel stack getting full\n", up->pid);
dumpregs(ur);
dumpstack();
for(;;);
}
if (up == nil &&
(char *)(ur) - (char *)m->stack < 1024 && dumps++ == 0) {
iprint("trap: cpu%d kernel stack getting full\n", m->machno);
dumpregs(ur);
dumpstack();
for(;;);
}
user = kenter(ur);
if (ur->cause & TS)
panic("trap: tlb shutdown");
@ -662,16 +648,7 @@ syscall(Ureg *ur)
up->nerrlab = 0;
ret = -1;
if(!waserror()) {
if(scallnr >= nsyscall || systab[scallnr] == 0){
pprint("bad sys call number %ld pc %#lux\n",
scallnr, ur->pc);
postnote(up, 1, "sys: bad sys call", NDebug);
error(Ebadarg);
}
if(sp & (BY2WD-1)){
pprint("odd sp in sys call pc %#lux sp %#lux\n",
ur->pc, ur->sp);
postnote(up, 1, "sys: odd stack", NDebug);
error(Ebadarg);
}
@ -680,6 +657,10 @@ syscall(Ureg *ur)
validaddr(sp, sizeof(Sargs)+BY2WD, 0);
up->s = *((Sargs*)(sp+BY2WD));
if(scallnr >= nsyscall || systab[scallnr] == nil){
postnote(up, 1, "sys: bad sys call", NDebug);
error(Ebadarg);
}
up->psstate = sysctab[scallnr];
ret = systab[scallnr]((va_list)up->s.args);
@ -714,8 +695,10 @@ syscall(Ureg *ur)
if(scallnr!=RFORK && (up->procctl || up->nnote))
notify(ur);
/* if we delayed sched because we held a lock, sched now */
if(up->delaysched)
if(up->delaysched){
sched();
splhi();
}
/* replicate fpstate to ureg status */
if(up->fpstate != FPactive)
ur->status &= ~CU1;

14
sys/src/9/teg2/syscall.c
View file

@ -206,21 +206,15 @@ syscall(Ureg* ureg)
l1cache->wb(); /* system is more stable with this */
if(!waserror()){
if(scallnr >= nsyscall){
pprint("bad sys call number %d pc %#lux\n",
scallnr, ureg->pc);
postnote(up, 1, "sys: bad sys call", NDebug);
error(Ebadarg);
}
if(sp < (USTKTOP-BY2PG) || sp > (USTKTOP-sizeof(Sargs)-BY2WD))
validaddr(sp, sizeof(Sargs)+BY2WD, 0);
up->s = *((Sargs*)(sp+BY2WD));
if(scallnr >= nsyscall || systab[scallnr] == nil){
postnote(up, 1, "sys: bad sys call", NDebug);
error(Ebadarg);
}
up->psstate = sysctab[scallnr];
/* iprint("%s: syscall %s\n", up->text, sysctab[scallnr]?sysctab[scallnr]:"huh?"); */
ret = systab[scallnr]((va_list)up->s.args);
poperror();
}else{

29
sys/src/9/teg2/trap.c
View file

@ -633,12 +633,12 @@ static int
irq(Ureg* ureg)
{
int clockintr, ack;
uint irqno, handled, t, ticks;
uint irqno, handled;
Intrcpuregs *icp = (Intrcpuregs *)soc.intr;
Vctl *v;
m->intr++;
ticks = perfticks();
m->perf.intrts = perfticks();
handled = 0;
ack = intack(icp);
irqno = ack & Intrmask;
@ -677,17 +677,6 @@ irq(Ureg* ureg)
iprint("cpu%d: unexpected interrupt %d, now masked\n",
m->machno, irqno);
}
t = perfticks();
if (0) { /* left over from another port? */
ilock(&nintrlock);
ninterrupt++;
if(t < ticks)
ninterruptticks += ticks-t;
else
ninterruptticks += t-ticks;
iunlock(&nintrlock);
}
USED(t, ticks);
clockintr = m->inclockintr == 1;
if (irqno == Loctmrirq)
m->inclockintr--;
@ -818,20 +807,6 @@ trap(Ureg *ureg)
int user, rem;
uintptr va, ifar, ifsr;
splhi(); /* paranoia */
if(up != nil)
rem = ((char*)ureg)-((char*)up-KSTACK);
else
rem = ((char*)ureg)-((char*)m+sizeof(Mach));
if(rem < 1024) {
iprint("trap: %d stack bytes left, up %#p ureg %#p m %#p cpu%d at pc %#lux\n",
rem, up, ureg, m, m->machno, ureg->pc);
dumpstackwithureg(ureg);
panic("trap: %d stack bytes left, up %#p ureg %#p at pc %#lux",
rem, up, ureg, ureg->pc);
}
m->perf.intrts = perfticks();
user = kenter(ureg);
/*
* All interrupts/exceptions should be resumed at ureg->pc-4,

28
sys/src/9/xen/trap.c
View file

@ -303,15 +303,11 @@ dumpstack(void)
static void
debugbpt(Ureg* ureg, void*)
{
char buf[ERRMAX];
print("debugbpt\n");
if(up == 0)
panic("kernel bpt");
/* restore pc to instruction that caused the trap */
ureg->pc--;
sprint(buf, "sys: breakpoint");
postnote(up, 1, buf, NDebug);
print("debugbpt for proc %lud\n", up->pid);
postnote(up, 1, "sys: breakpoint", NDebug);
}
static void
@ -409,19 +405,16 @@ syscall(Ureg* ureg)
up->nerrlab = 0;
ret = -1;
if(!waserror()){
if(scallnr >= nsyscall || systab[scallnr] == 0){
pprint("bad sys call number %lud pc %lux\n",
scallnr, ureg->pc);
postnote(up, 1, "sys: bad sys call", NDebug);
error(Ebadarg);
}
if(sp<(USTKTOP-BY2PG) || sp>(USTKTOP-sizeof(Sargs)-BY2WD))
validaddr(sp, sizeof(Sargs)+BY2WD, 0);
up->s = *((Sargs*)(sp+BY2WD));
up->psstate = sysctab[scallnr];
if(scallnr >= nsyscall || systab[scallnr] == nil){
postnote(up, 1, "sys: bad sys call", NDebug);
error(Ebadarg);
}
up->psstate = sysctab[scallnr];
ret = systab[scallnr]((va_list)up->s.args);
poperror();
}else{
@ -462,13 +455,14 @@ syscall(Ureg* ureg)
if(scallnr == NOTED)
noted(ureg, *(ulong*)(sp+BY2WD));
if(scallnr!=RFORK && (up->procctl || up->nnote)){
splhi();
splhi();
if(scallnr!=RFORK && (up->procctl || up->nnote))
notify(ureg);
}
/* if we delayed sched because we held a lock, sched now */
if(up->delaysched)
if(up->delaysched){
sched();
splhi();
}
INTRLOG(dprint("before kexit\n");)
kexit(ureg);
}

18
sys/src/9/zynq/trap.c
View file

@ -236,9 +236,7 @@ syscall(Ureg *ureg)
splx(s);
startns = todget(nil);
}
if(scallnr >= nsyscall || systab[scallnr] == 0){
pprint("bad sys call number %lud pc %lux", scallnr, ureg->pc);
if(scallnr >= nsyscall || systab[scallnr] == nil){
postnote(up, 1, "sys: bad sys call", NDebug);
error(Ebadarg);
}
@ -272,14 +270,14 @@ syscall(Ureg *ureg)
if(scallnr == NOTED)
noted(ureg, *((ulong *) up->s.args));
if(scallnr != RFORK && (up->procctl || up->nnote)){
splhi();
notify(ureg);
}
if(up->delaysched)
sched();
kexit(ureg);
splhi();
if(scallnr != RFORK && (up->procctl || up->nnote))
notify(ureg);
if(up->delaysched){
sched();
splhi();
}
kexit(ureg);
}
int