From b8772cce090adb3d27cdd8b49d236662b526424e Mon Sep 17 00:00:00 2001 From: jistone Date: Wed, 7 Feb 2007 02:54:30 +0000 Subject: 2007-02-06 Josh Stone * aux_syscalls.stp, inet_sock.stp, ioblock.stp, ioscheduler.stp, nfs.stp, nfs_proc.stp, nfsd.stp, rpc.stp, scsi.stp, signal.stp, socket.stp, task.stp, tcp.stp, vfs.stp: Protect pointer dereferences with kread wherever possible. Some places still have hazards, as marked with FIXMEs. * errno.stp (returnstr): Don't use return in tapset C functions. * aux_syscalls.stp (__uget_timex_m): Ditto. * nfsd.stp (__get_fh): Ditto. * nfs.stp, vfs.stp (): Ditto. * string.stp (substr): Ditto. Also make sure start index is valid. * syscalls.stp (syscall.execve): Change __string to kernel_string. LKET/ * nfs.stp, nfs_proc.stp, nfsd.stp, process.stp, tskdispatch.stp: Protect pointer dereferences with kread wherever possible. Some places still have hazards, as marked with FIXMEs. * aio.stp (log_io_getevents): Don't use return in tapset C functions. * timestamp.stp (set_timing_method): Ditto. * utils.stp (filter_by_pid): Ditto. --- tapset/string.stp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'tapset/string.stp') diff --git a/tapset/string.stp b/tapset/string.stp index 15791134..2f43aecc 100644 --- a/tapset/string.stp +++ b/tapset/string.stp @@ -20,10 +20,8 @@ function strlen:long(s:string) %{ /* pure */ * @return Returns the substring. */ function substr:string(str:string,start:long, length:long) %{ /* pure */ - int length = THIS->length + 1 > MAXSTRINGLEN ? MAXSTRINGLEN : THIS->length + 1; - if (THIS->start < 0 || length < 1) { - return; - } else + int length = THIS->length >= MAXSTRINGLEN ? MAXSTRINGLEN : THIS->length + 1; + if (THIS->start >= 0 && length > 0 && THIS->start < strlen(THIS->str)) strlcpy(THIS->__retvalue, THIS->str + THIS->start, length); %} -- cgit