svn commit: r209697 - head/sys/kern

[Konstantin Belousov]

Author: kib
Date: Sun Jul  4 18:16:17 2010
New Revision: 209697
URL: http://svn.freebsd.org/changeset/base/209697

Log:
  Obey sv_syscallnames bounds in syscallname().
  
  Reported and tested by:	pho

Modified:
  head/sys/kern/subr_trap.c

Modified: head/sys/kern/subr_trap.c
==============================================================================
--- head/sys/kern/subr_trap.c	Sun Jul  4 17:37:28 2010	(r209696)
+++ head/sys/kern/subr_trap.c	Sun Jul  4 18:16:17 2010	(r209697)
@@ -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