diff options
| author | jistone <jistone> | 2007-02-07 02:54:30 +0000 |
|---|---|---|
| committer | jistone <jistone> | 2007-02-07 02:54:30 +0000 |
| commit | b8772cce090adb3d27cdd8b49d236662b526424e (patch) | |
| tree | f216b71b2bea50d0bd95c9d22956a07e0b6fa49c /tapset/string.stp | |
| parent | 3b4136ca14c78881c50e8c36fa35fa574edaabb4 (diff) | |
| download | systemtap-steved-b8772cce090adb3d27cdd8b49d236662b526424e.tar.gz systemtap-steved-b8772cce090adb3d27cdd8b49d236662b526424e.tar.xz systemtap-steved-b8772cce090adb3d27cdd8b49d236662b526424e.zip | |
2007-02-06 Josh Stone <joshua.i.stone@intel.com>
* 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 (<many functions>): 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.
Diffstat (limited to 'tapset/string.stp')
| -rw-r--r-- | tapset/string.stp | 6 |
1 files changed, 2 insertions, 4 deletions
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); %} |