diff options
| -rw-r--r-- | tapset/i686/syscalls.stp | 32 | ||||
| -rw-r--r-- | tapset/syscalls.stp | 27 | ||||
| -rw-r--r-- | tapset/syscalls2.stp | 27 |
3 files changed, 31 insertions, 55 deletions
diff --git a/tapset/i686/syscalls.stp b/tapset/i686/syscalls.stp index fa64a291..a0d97b1c 100644 --- a/tapset/i686/syscalls.stp +++ b/tapset/i686/syscalls.stp @@ -230,16 +230,13 @@ probe syscall.fcntl64.return = kernel.function("sys_fcntl64").return { retstr = returnstr(1) } # fstat64 ____________________________________________________ -/* - * asmlinkage long - * sys_fstat64(unsigned long fd, - * struct stat64 __user * statbuf) - */ +# long sys_fstat64(unsigned long fd, +# struct stat64 __user * statbuf) probe syscall.fstat64 = kernel.function("sys_fstat64") { name = "fstat64" fd = $fd buf_uaddr = $statbuf - argstr = sprintf("%d, [%p]", $fd, buf_uaddr) + argstr = sprintf("%d, [%p]", $fd, $statbuf) } probe syscall.fstat64.return = kernel.function("sys_fstat64").return { name = "fstat64" @@ -389,20 +386,15 @@ probe syscall.ipc.return = kernel.function("sys_ipc").return { retstr = returnstr(1) } # lstat64 ____________________________________________________ -/* - * asmlinkage long - * sys_lstat64(char __user * filename, - * struct stat64 __user * statbuf) - */ +# long sys_lstat64(char __user * filename, +# struct stat64 __user * statbuf) probe syscall.lstat64 = kernel.function("sys_lstat64") { name = "lstat64" - filename_uaddr = $filename filename = user_string($filename) buf_uaddr = $statbuf - argstr = sprintf("%s, [%p]", filename, buf_uaddr) + argstr = sprintf("\"%s\", [%p]", filename, $statbuf) } -probe syscall.lstat64.return = - kernel.function("sys_lstat64").return { +probe syscall.lstat64.return = kernel.function("sys_lstat64").return { name = "lstat64" retstr = returnstr(1) } @@ -628,17 +620,13 @@ probe syscall.sigsuspend.return = retstr = returnstr(1) } # stat64 _____________________________________________________ -/* - * asmlinkage long - * sys_stat64(char __user * filename, - * struct stat64 __user * statbuf) - */ +# long sys_stat64(char __user * filename, +# struct stat64 __user * statbuf) probe syscall.stat64 = kernel.function("sys_stat64") { name = "stat64" - filename_uaddr = $filename filename = user_string($filename) buf_uaddr = $statbuf - argstr = sprintf("%s, [%p]", filename, buf_uaddr) + argstr = sprintf("\"%s\", [%p]", filename, $statbuf) } probe syscall.stat64.return = kernel.function("sys_stat64").return { name = "stat64" diff --git a/tapset/syscalls.stp b/tapset/syscalls.stp index c8cf69a2..14416d90 100644 --- a/tapset/syscalls.stp +++ b/tapset/syscalls.stp @@ -1408,21 +1408,18 @@ probe kernel.syscall.lgetxattr.return = name = "lgetxattr.return" } # link _______________________________________________________ -/* - * asmlinkage long - * sys_link(const char __user * oldname, - * const char __user * newname) - */ -probe kernel.syscall.link = - kernel.function("sys_link") { - name = "link" - oldpath_uaddr = $oldname - newpath_uaddr = $newname - } -probe kernel.syscall.link.return = - kernel.function("sys_link").return { - name = "link.return" - } +# long sys_link(const char __user * oldname, +# const char __user * newname) +probe syscall.link = kernel.function("sys_link") { + name = "link" + oldpath = user_string($oldname) + newpath = user_string($newname) + argstr = sprintf("\"%s\", \"%s\"", oldpath, newpath) +} +probe syscall.link.return = kernel.function("sys_link").return { + name = "link" + retstr = returnstr(1) +} # listen _____________________________________________________ # long sys_listen(int fd, int backlog) diff --git a/tapset/syscalls2.stp b/tapset/syscalls2.stp index 5211705e..aeb229a7 100644 --- a/tapset/syscalls2.stp +++ b/tapset/syscalls2.stp @@ -450,18 +450,16 @@ probe syscall.readahead.return = kernel.function("sys_readahead").return { } # readlink ___________________________________________________ # -# asmlinkage long -# sys_readlink(const char __user * path, +# long sys_readlink(const char __user * path, # char __user * buf, # int bufsiz) # probe syscall.readlink = kernel.function("sys_readlink") { name = "readlink" - path_uaddr = $path - path_str = user_string(path_uaddr) + path = user_string($path) buf_uaddr = $buf bufsiz = $bufsiz - argstr = sprintf("%s, [%p], %p", path_str, buf_uaddr, bufsiz) + argstr = sprintf("\"%s\", [%p], %d", path, buf_uaddr, bufsiz) } probe syscall.readlink.return = kernel.function("sys_readlink").return { name = "readlink" @@ -1832,16 +1830,14 @@ probe syscall.ssetmask.return = kernel.function("sys_ssetmask").return { # statfs _____________________________________________________ # -# asmlinkage long -# sys_statfs(const char __user * path, +# long sys_statfs(const char __user * path, # struct statfs __user * buf) # probe syscall.statfs = kernel.function("sys_statfs") { name = "statfs" - path_uaddr = $path path = user_string($path) buf_uaddr = $buf - argstr = sprintf("%s, [%p]", path, buf_uaddr) + argstr = sprintf("%s, [%p]", path, $buf) } probe syscall.statfs.return = kernel.function("sys_statfs").return { name = "statfs" @@ -1849,18 +1845,16 @@ probe syscall.statfs.return = kernel.function("sys_statfs").return { } # statfs64 ___________________________________________________ # -# asmlinkage long -# sys_statfs64(const char __user *path, +# long sys_statfs64(const char __user *path, # size_t sz, # struct statfs64 __user *buf) # probe syscall.statfs64 = kernel.function("sys_statfs64") { name = "statfs64" - path_uaddr = $path path = user_string($path) sz = $sz buf_uaddr = $buf - argstr = sprintf("%s, %d, [%p]", path, $sz, buf_uaddr) + argstr = sprintf("%s, %d, [%p]", path, $sz, $buf) } probe syscall.statfs64.return = kernel.function("sys_statfs64").return { name = "statfs64" @@ -1913,16 +1907,13 @@ probe syscall.swapon.return = kernel.function("sys_swapon").return { retstr = returnstr(1) } # symlink ____________________________________________________ -# -# asmlinkage long -# sys_symlink(const char __user * oldname, +# long sys_symlink(const char __user * oldname, # const char __user * newname) -# probe syscall.symlink = kernel.function("sys_symlink") { name = "symlink" oldpath = user_string($oldname) newpath = user_string($newname) - argstr = sprintf("%s, %s", oldpath, newpath) + argstr = sprintf("\"%s\", \"%s\"", oldpath, newpath) } probe syscall.symlink.return = kernel.function("sys_symlink").return { name = "symlink" |