summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2010-07-04 18:16:17 +0000
committerkib <kib@FreeBSD.org>2010-07-04 18:16:17 +0000
commit4de7ec3dbbe45af222a8e20d116f56a05b09b0ea (patch)
tree920b25d4add0b968df5187480443470df3f27d3f
parent5758b8c344de54ad9c4d7eba693a0ce23e0e3a90 (diff)
downloadFreeBSD-src-4de7ec3dbbe45af222a8e20d116f56a05b09b0ea.zip
FreeBSD-src-4de7ec3dbbe45af222a8e20d116f56a05b09b0ea.tar.gz
Obey sv_syscallnames bounds in syscallname().
Reported and tested by: pho
-rw-r--r--sys/kern/subr_trap.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c
index ee23726..6a97779 100644
--- a/sys/kern/subr_trap.c
+++ b/sys/kern/subr_trap.c
@@ -245,10 +245,12 @@ const char *
syscallname(struct proc *p, u_int code)
{
static const char unknown[] = "unknown";
+ struct sysentvec *sv;
- if (p->p_sysent->sv_syscallnames == NULL)
+ sv = p->p_sysent;
+ if (sv->sv_syscallnames == NULL || code >= sv->sv_size)
return (unknown);
- return (p->p_sysent->sv_syscallnames[code]);
+ return (sv->sv_syscallnames[code]);
}
int
OpenPOWER on IntegriCloud