diff options
| -rw-r--r-- | tapset/i686/syscalls.stp | 44 | ||||
| -rw-r--r-- | tapset/ppc64/syscalls.stp | 174 | ||||
| -rw-r--r-- | tapset/syscalls.stp | 195 | ||||
| -rw-r--r-- | tapset/syscalls2.stp | 138 | ||||
| -rw-r--r-- | tapset/x86_64/syscalls.stp | 30 |
5 files changed, 272 insertions, 309 deletions
diff --git a/tapset/i686/syscalls.stp b/tapset/i686/syscalls.stp index 42f069d4..e8ab3e18 100644 --- a/tapset/i686/syscalls.stp +++ b/tapset/i686/syscalls.stp @@ -5,7 +5,7 @@ probe syscall.fstat = kernel.function("sys_fstat") { name = "fstat" filedes = $fd buf_uaddr = $statbuf - argstr = sprintf("%d, [0x%x]", filedes, buf_uaddr) + argstr = sprintf("%d, [0x%p]", filedes, buf_uaddr) } probe syscall.fstat.return = kernel.function("sys_fstat").return { name = "fstat" @@ -48,7 +48,7 @@ probe syscall.getgroups16 = kernel.function("sys_getgroups16") { name = "getgroups16" size = $gidsetsize list_uaddr = $grouplist - argstr = sprintf("%d, [0x%x]", size, list_uaddr) + argstr = sprintf("%d, [0x%p]", size, list_uaddr) } probe syscall.getgroups16.return = kernel.function("sys_getgroups16").return { name = "getgroups16" @@ -71,7 +71,7 @@ probe syscall.lstat = kernel.function("sys_lstat") { name = "lstat" file_name = user_string($filename) buf_uaddr = $statbuf - argstr = sprintf("%s, [0x%x]", file_name, buf_uaddr) + argstr = sprintf("%s, [0x%p]", file_name, buf_uaddr) } probe syscall.lstat.return = kernel.function("sys_lstat").return { name = "lstat.return" @@ -90,7 +90,7 @@ probe syscall.mmap2 = kernel.function("sys_mmap2") { flags = $flags fd = $fd pgoffset = $pgoff - argstr = sprintf("0x%x, %d, %s, %s, %d, 0x%x", start, + argstr = sprintf("0x%p, %d, %s, %s, %d, 0x%p", start, length, _mprotect_prot_str(prot), _mmap_flags(flags), fd, pgoffset) } @@ -127,7 +127,7 @@ probe syscall.stat = kernel.function("sys_stat") { filename_uaddr = $filename filename = user_string($filename) buf_uaddr = $statbuf - argstr = sprintf("%s, [0x%x]", filename, buf_uaddr) + argstr = sprintf("%s, [0x%p]", filename, buf_uaddr) } probe syscall.stat.return = kernel.function("sys_stat").return { name = "stat" @@ -181,7 +181,7 @@ probe syscall.quotactl = kernel.function("sys_quotactl") { special_str = user_string($special) id = $id addr_uaddr = $addr - argstr = sprintf("%s, %s, 0x%x, [0x%x]", cmd_str, special_str, + argstr = sprintf("%s, %s, 0x%p, [0x%p]", cmd_str, special_str, id, addr_uaddr) } probe syscall.quotactl.return = kernel.function("sys_quotactl").return { @@ -202,7 +202,7 @@ probe syscall.request_key = kernel.function("sys_request_key") { description_uaddr = $_description callout_info_uaddr = $_callout_info destringid = $destringid - argstr = sprintf("[0x%x], [0x%x], [0x%x], 0x%x", type_uaddr, + argstr = sprintf("[0x%p], [0x%p], [0x%p], 0x%p", type_uaddr, description_uaddr, callout_info_uaddr, destringid) } probe syscall.request_key.return = kernel.function("sys_request_key").return { @@ -223,7 +223,7 @@ name = "fcntl64" cmd = $cmd cmd_str = _fcntl_cmd_str($cmd) arg = $arg - argstr = sprintf("%d, %s, 0x%x", $fd, cmd_str, $arg) + argstr = sprintf("%d, %s, 0x%p", $fd, cmd_str, $arg) } probe syscall.fcntl64.return = kernel.function("sys_fcntl64").return { name = "fcntl64" @@ -239,7 +239,7 @@ probe syscall.fstat64 = kernel.function("sys_fstat64") { name = "fstat64" fd = $fd buf_uaddr = $statbuf - argstr = sprintf("%d, [0x%x]", $fd, buf_uaddr) + argstr = sprintf("%d, [0x%p]", $fd, buf_uaddr) } probe syscall.fstat64.return = kernel.function("sys_fstat64").return { name = "fstat64" @@ -253,7 +253,7 @@ probe syscall.fstat64.return = kernel.function("sys_fstat64").return { probe syscall.get_thread_area = kernel.function("sys_get_thread_area") { name = "get_thread_area" u_info_uaddr = $u_info - argstr = sprintf("[0x%x]", u_info_uaddr) + argstr = sprintf("[0x%p]", u_info_uaddr) } probe syscall.get_thread_area.return = kernel.function("sys_get_thread_area").return { @@ -381,7 +381,7 @@ probe syscall.ipc = kernel.function("sys_ipc") { third = $third ptr_uaddr = $ptr fifth = $fifth - argstr = sprintf("%d, %d, %d, %d, [0x%x], %d", $call, $first, + argstr = sprintf("%d, %d, %d, %d, [0x%p], %d", $call, $first, $second, $third, ptr_uaddr, $fifth) } probe syscall.ipc.return = kernel.function("sys_ipc").return { @@ -399,7 +399,7 @@ probe syscall.lstat64 = kernel.function("sys_lstat64") { filename_uaddr = $filename filename = user_string($filename) buf_uaddr = $statbuf - argstr = sprintf("%s, [0x%x]", filename, buf_uaddr) + argstr = sprintf("%s, [0x%p]", filename, buf_uaddr) } probe syscall.lstat64.return = kernel.function("sys_lstat64").return { @@ -414,7 +414,7 @@ probe syscall.lstat64.return = probe syscall.olduname = kernel.function("sys_olduname") { name = "olduname" name_uaddr = $name - argstr = sprintf("[0x%x]", name_uaddr) + argstr = sprintf("[0x%p]", name_uaddr) } probe syscall.olduname.return = kernel.function("sys_olduname").return { name = "olduname" @@ -451,7 +451,7 @@ probe syscall.sched_setaffinity = */ len = $len mask_uaddr = $user_mask_ptr - argstr = sprintf("%d, %d, [0x%x]", $pid, $len, mask_uaddr) + argstr = sprintf("%d, %d, [0x%p]", $pid, $len, mask_uaddr) } probe syscall.sched_setaffinity.return = kernel.function("sys_sched_setaffinity").return { @@ -469,7 +469,7 @@ probe syscall.sched_setparam = name = "sched_setparam" pid = $pid p_uaddr = $param - argstr = sprintf("%d, [0x%x]", $pid, p_uaddr) + argstr = sprintf("%d, [0x%p]", $pid, p_uaddr) } probe syscall.sched_setparam.return = kernel.function("do_sched_setscheduler").return { @@ -490,7 +490,7 @@ probe syscall.sched_setscheduler = policy = $policy policy_str = _sched_policy_str($policy) p_uaddr = $param - argstr = sprintf("%d, %s, [0x%x]", $pid, policy_str, p_uaddr) + argstr = sprintf("%d, %s, [0x%p]", $pid, policy_str, p_uaddr) } probe syscall.sched_setscheduler.return = kernel.function("do_sched_setscheduler").return { @@ -506,7 +506,7 @@ probe syscall.set_thread_area = kernel.function("sys_set_thread_area") { name = "set_thread_area" u_info_uaddr = $u_info - argstr = sprintf("[0x%x]", u_info_uaddr) + argstr = sprintf("[0x%p]", u_info_uaddr) } probe syscall.set_thread_area.return = kernel.function("sys_set_thread_area").return { @@ -548,7 +548,7 @@ probe syscall.shmat = shmid = $shmid shmaddr_uaddr = $shmaddr shmflg = $shmflg - argstr = sprintf("%d, [0x%x], %d", $shmid, shmaddr_uaddr, $shmflg) + argstr = sprintf("%d, [0x%p], %d", $shmid, shmaddr_uaddr, $shmflg) } probe syscall.shmat.return = kernel.function("sys_shmat").return { @@ -568,7 +568,7 @@ probe syscall.sigaction = sig = $sig act_uaddr = $act oact_uaddr = $oact - argstr = sprintf("%s, [0x%x], [0x%x]", _signal_name($sig), + argstr = sprintf("%s, [0x%p], [0x%p]", _signal_name($sig), act_uaddr, oact_uaddr) } probe syscall.sigaction.return = @@ -585,7 +585,7 @@ probe syscall.sigaltstack = kernel.function("sys_sigaltstack") { name = "sigaltstack" ebx = $ebx - argstr = sprintf("0x%x", $ebx) + argstr = sprintf("0x%p", $ebx) } probe syscall.sigaltstack.return = kernel.function("sys_sigaltstack").return { @@ -620,7 +620,7 @@ probe syscall.sigsuspend = history0 = $history0 history1 = $history1 mask = $mask - argstr = sprintf("%d, %d, 0x%x", $history0, $history1, $mask) + argstr = sprintf("%d, %d, 0x%p", $history0, $history1, $mask) } probe syscall.sigsuspend.return = kernel.function("sys_sigsuspend").return { @@ -638,7 +638,7 @@ probe syscall.stat64 = kernel.function("sys_stat64") { filename_uaddr = $filename filename = user_string($filename) buf_uaddr = $statbuf - argstr = sprintf("%s, [0x%x]", filename, buf_uaddr) + argstr = sprintf("%s, [0x%p]", filename, buf_uaddr) } probe syscall.stat64.return = kernel.function("sys_stat64").return { name = "stat64" diff --git a/tapset/ppc64/syscalls.stp b/tapset/ppc64/syscalls.stp index 9624fd3c..0a9d70f6 100644 --- a/tapset/ppc64/syscalls.stp +++ b/tapset/ppc64/syscalls.stp @@ -8,7 +8,7 @@ probe syscall.compat_sys_nanosleep = kernel.function("compat_sys_nanosleep") { name = "compat_sys_nanosleep" rqtp_uaddr = $rqtp rmtp_uaddr = $rmtp - argstr = sprintf("[0x%x], [0x%x]", rqtp_uaddr, rmtp_uaddr) + argstr = sprintf("[0x%p], [0x%p]", rqtp_uaddr, rmtp_uaddr) } probe syscall.compat_sys_nanosleep.return = kernel.function("compat_sys_nanosleep").return { @@ -24,7 +24,7 @@ probe syscall.compat_sys_getitimer = kernel.function("compat_sys_getitimer") { name = "compat_sys_getitimer" which = $which value_uaddr = $it - argstr = sprintf("%s, [0x%x]", _itimer_which_str(which), value_uaddr) + argstr = sprintf("%s, [0x%p]", _itimer_which_str(which), value_uaddr) } probe syscall.compat_sys_getitimer.return = kernel.function("compat_sys_getitimer").return { @@ -42,7 +42,7 @@ probe syscall.compat_sys_setitimer = kernel.function("compat_sys_setitimer") { which = $which value_uaddr = $in ovalue_uaddr = $out - argstr = sprintf("%s, %s, 0x%x", _itimer_which_str($which), + argstr = sprintf("%s, %s, 0x%p", _itimer_which_str($which), _struct_itimerval_u($in), $out) } probe syscall.compat_sys_setitimer.return = @@ -57,7 +57,7 @@ probe syscall.compat_sys_setitimer.return = probe syscall.compat_sys_times = kernel.function("compat_sys_times") { name = "compat_sys_times" buf_uaddr = $tbuf - argstr = sprintf("[0x%x]", buf_uaddr) + argstr = sprintf("[0x%p]", buf_uaddr) } probe syscall.compat_sys_times.return = kernel.function("compat_sys_times").return { @@ -71,7 +71,7 @@ probe syscall.compat_sys_times.return = probe syscall.compat_sys_sigpending = kernel.function("compat_sys_sigpending") { name = "compat_sys_sigpending" set_uaddr = $set - argstr = sprintf("[0x%x]", set_uaddr) + argstr = sprintf("[0x%p]", set_uaddr) } probe syscall.compat_sys_sigpending.return = kernel.function("compat_sys_sigpending").return { @@ -89,7 +89,7 @@ probe syscall.compat_sys_sigprocmask = kernel.function("compat_sys_sigprocmask") how = $how set_uaddr = $set oldset_uaddr = $oset - argstr = sprintf("%s, [0x%x], [0x%x]", _sigprocmask_how_str($how), + argstr = sprintf("%s, [0x%p], [0x%p]", _sigprocmask_how_str($how), set_uaddr, oldset_uaddr) } probe syscall.compat_sys_sigprocmask.return = @@ -111,7 +111,7 @@ probe syscall.compat_sys_futex = kernel.function("compat_sys_futex") { utime_uaddr = $utime uaddr2_uaddr = $uaddr2 val3 = $val3 - argstr = sprintf("0x%x, %s, %d, %s", $uaddr, _futex_op_str($op), + argstr = sprintf("0x%p, %s, %d, %s", $uaddr, _futex_op_str($op), $val, _struct_timespec_u($utime)) } probe syscall.compat_sys_futex.return = @@ -179,7 +179,7 @@ probe syscall.compat_sys_getrusage = kernel.function("compat_sys_getrusage") { name = "compat_sys_getrusage" who = $who usage_uaddr = $ru - argstr = sprintf("%s, [0x%x]",_rusage_who_str($who), usage_uaddr) + argstr = sprintf("%s, [0x%p]",_rusage_who_str($who), usage_uaddr) } probe syscall.compat_sys_getrusage.return = kernel.function("compat_sys_getrusage").return { @@ -197,7 +197,7 @@ probe syscall.compat_sys_wait4 = kernel.function("compat_sys_wait4") { status_uaddr = $stat_addr options = $options rusage_uaddr = $ru - argstr = sprintf("%d, [0x%x], %s, [0x%x]", $pid, status_uaddr, + argstr = sprintf("%d, [0x%p], %s, [0x%p]", $pid, status_uaddr, _wait4_opt_str($options), rusage_uaddr) } probe syscall.compat_sys_wait4.return = @@ -216,7 +216,7 @@ probe syscall.compat_sys_sched_setaffinity = kernel.function("compat_sys_sched_s pid = $pid len = $len mask_uaddr = $user_mask_ptr - argstr = sprintf("%d, %d, [0x%x]", pid, len, mask_uaddr) + argstr = sprintf("%d, %d, [0x%p]", pid, len, mask_uaddr) } probe syscall.compat_sys_sched_setaffinity.return = kernel.function("compat_sys_sched_setaffinity").return { @@ -234,7 +234,7 @@ probe syscall.compat_sys_sched_getaffinity = kernel.function("compat_sys_sched_g pid = $pid len = $len mask_uaddr = $user_mask_ptr - argstr = sprintf("%d, %d, [0x%x]", pid, len, mask_uaddr) + argstr = sprintf("%d, %d, [0x%p]", pid, len, mask_uaddr) } probe syscall.compat_sys_sched_getaffinity.return = kernel.function("compat_sys_sched_getaffinity").return { @@ -250,7 +250,7 @@ probe syscall.compat_sys_utime = kernel.function("compat_sys_utime") { name = "compat_sys_utime" filename = user_string($filename) buf_uaddr = $t - argstr = sprintf("%s, [0x%x]", filename, buf_uaddr) + argstr = sprintf("%s, [0x%p]", filename, buf_uaddr) } probe syscall.compat_sys_utime.return = kernel.function("compat_sys_utime").return { @@ -282,7 +282,7 @@ probe syscall.compat_sys_newstat = kernel.function("compat_sys_newstat") { name = "compat_sys_newstat" file_name = user_string($filename) buf_uaddr = $statbuf - argstr = sprintf("\"%s\", [0x%x]", file_name, buf_uaddr) + argstr = sprintf("\"%s\", [0x%p]", file_name, buf_uaddr) } probe syscall.compat_sys_newstat.return = kernel.function("compat_sys_newstat").return { @@ -298,7 +298,7 @@ probe syscall.compat_sys_newlstat = kernel.function("compat_sys_newlstat") { name = "compat_sys_newlstat" file_name = user_string($filename) buf_uaddr = $statbuf - argstr = sprintf("\"%s\", [0x%x]", file_name, buf_uaddr) + argstr = sprintf("\"%s\", [0x%p]", file_name, buf_uaddr) } probe syscall.compat_sys_newlstat.return = kernel.function("compat_sys_newlstat").return { @@ -314,7 +314,7 @@ probe syscall.compat_sys_newfstat = kernel.function("compat_sys_newfstat") { name = "compat_sys_newfstat" filedes = $fd buf_uaddr = $statbuf - argstr = sprintf("%d, [0x%x]", filedes, buf_uaddr) + argstr = sprintf("%d, [0x%p]", filedes, buf_uaddr) } probe syscall.compat_sys_newfstat.return = kernel.function("compat_sys_newfstat").return { @@ -330,7 +330,7 @@ probe syscall.compat_sys_statfs = kernel.function("compat_sys_statfs") { name = "compat_sys_statfs" path = user_string($path) buf_uaddr = $buf - argstr = sprintf("%s, [0x%x]", path, buf_uaddr) + argstr = sprintf("%s, [0x%p]", path, buf_uaddr) } probe syscall.compat_sys_statfs.return = kernel.function("compat_sys_statfs").return { @@ -346,7 +346,7 @@ probe syscall.compat_sys_fstatfs = kernel.function("compat_sys_fstatfs") { name = "compat_sys_fstatfs" fd = $fd buf_uaddr = $buf - argstr = sprintf("%d, [0x%x]", fd, buf_uaddr) + argstr = sprintf("%d, [0x%p]", fd, buf_uaddr) } probe syscall.compat_sys_fstatfs.return = kernel.function("compat_sys_fstatfs").return { @@ -363,7 +363,7 @@ probe syscall.compat_sys_ioctl = kernel.function("compat_sys_ioctl") { d = $fd request = cmd arg = $arg - argstr = sprintf("%d, %d, [0x%x]", fd, request, arg) + argstr = sprintf("%d, %d, [0x%p]", fd, request, arg) } probe syscall.compat_sys_ioctl.return = kernel.function("compat_sys_ioctl").return { @@ -380,7 +380,7 @@ probe syscall.compat_sys_fcntl64 = kernel.function("compat_sys_fcntl64") { fd = $fd cmd = $cmd arg = $arg - argstr = sprintf("%d, %s, [0x%x]", fd, _fcntl_cmd_str($cmd), arg) + argstr = sprintf("%d, %s, [0x%p]", fd, _fcntl_cmd_str($cmd), arg) } probe syscall.compat_sys_fcntl64.return = kernel.function("compat_sys_fcntl64").return { @@ -397,7 +397,7 @@ probe syscall.compat_sys_fcntl = kernel.function("compat_sys_fcntl") { fd = $fd cmd = $cmd arg = $arg - argstr = sprintf("%d, %s, 0x%x", fd, _fcntl_cmd_str($cmd), arg) + argstr = sprintf("%d, %s, 0x%p", fd, _fcntl_cmd_str($cmd), arg) } probe syscall.compat_sys_fcntl.return = kernel.function("compat_sys_fcntl").return { @@ -412,7 +412,7 @@ probe syscall.compat_sys_io_setup = kernel.function("compat_sys_io_setup") { name = "compat_sys_io_setup" maxevents = $nr_reqs ctxp_uaddr = $ctx32p - argstr = sprintf("%d, [0x%x]", maxevents, ctxp_uaddr) + argstr = sprintf("%d, [0x%p]", maxevents, ctxp_uaddr) } probe syscall.compat_sys_io_setup.return = kernel.function("compat_sys_io_setup").return { @@ -434,7 +434,7 @@ probe syscall.compat_sys_io_getevents = kernel.function("compat_sys_io_getevents nr = $nr events_uaddr = $events timeout_uaddr = $timeout - argstr = sprintf("%d, %d, %d, [0x%x],[0x%x]", ctx_id, min_nr, nr, + argstr = sprintf("%d, %d, %d, [0x%p],[0x%p]", ctx_id, min_nr, nr, events_uaddr, timeout_uaddr) } probe syscall.compat_sys_io_getevents.return = @@ -452,7 +452,7 @@ probe syscall.compat_sys_io_submit = kernel.function("compat_sys_io_submit") { ctx_id = $ctx_id nr = $nr iocbpp_uaddr = iocb - argstr = sprintf("%d, %d, [0x%x]", ctx_id, nr, iocbpp_uaddr) + argstr = sprintf("%d, %d, [0x%p]", ctx_id, nr, iocbpp_uaddr) } probe syscall.compat_sys_io_submit.return = kernel.function("compat_sys_io_submit").return { @@ -474,7 +474,7 @@ probe syscall.compat_sys_mount = kernel.function("compat_sys_mount") { filesystemtype = user_string($type) mountflags = $flags data_uaddr = $data - argstr = sprintf("\"%s\", \"%s\", \"%s\", %s, [0x%x]", source, + argstr = sprintf("\"%s\", \"%s\", \"%s\", %s, [0x%p]", source, target, filesystemtype, _mountflags_str($flags), data_uaddr) } @@ -494,7 +494,7 @@ probe syscall.compat_sys_getdents = kernel.function("compat_sys_getdents") { fd = $fd dirent_uaddr = $dirent count = $count - argstr = sprintf("%d, [0x%x], %d", fd, dirp_uaddr, count) + argstr = sprintf("%d, [0x%p], %d", fd, dirp_uaddr, count) } probe syscall.compat_sys_getdents.return = kernel.function("compat_sys_getdents").return { @@ -512,7 +512,7 @@ probe syscall.compat_sys_getdents64 = kernel.function("compat_sys_getdents64") { fd = $fd dirent_uaddr = $dirent count = $count - argstr = sprintf("%d, [0x%x], %d", fd, dirp_uaddr, count) + argstr = sprintf("%d, [0x%p], %d", fd, dirp_uaddr, count) } probe syscall.compat_sys_getdents64.return = kernel.function("compat_sys_getdents64").return { @@ -531,7 +531,7 @@ probe syscall.compat_sys_readv = kernel.function("compat_sys_readv") { # fd = $fd vector_uaddr = $vec count = $vlen - argstr = sprintf("unknown fd, [0x%x], 0x%x", vector_uaddr, count) + argstr = sprintf("unknown fd, [0x%p], 0x%p", vector_uaddr, count) } probe syscall.compat_sys_readv.return = kernel.function("compat_sys_readv").return { @@ -550,7 +550,7 @@ probe syscall.compat_sys_writev = kernel.function("compat_sys_writev") { # fd = $fd vector_uaddr = $vec count = $vlen - argstr = sprintf("unknown fd, [0x%x], %d", vector_uaddr, $vlen) + argstr = sprintf("unknown fd, [0x%p], %d", vector_uaddr, $vlen) } probe syscall.compat_sys_writev.return = kernel.function("compat_sys_writev").return { @@ -594,7 +594,7 @@ probe syscall.compat_sys_nfsservctl = kernel.function("compat_sys_nfsservctl") { cmd = $cmd argp_uaddr = $arg resp_uaddr = $res - argstr = sprintf("0x%x, [0x%x], [0x%x]", cmd, argp_uaddr, resp_uaddr) + argstr = sprintf("0x%p, [0x%p], [0x%p]", cmd, argp_uaddr, resp_uaddr) } probe syscall.compat_sys_nfsservctl.return = kernel.function("compat_sys_nfsservctl").return { @@ -628,7 +628,7 @@ probe syscall.compat_sys_msgsnd = kernel.function("compat_sys_msgsnd") { second = $second third = $third uptr_uaddr = $uptr - argstr = sprintf("%d, %d, %d, [0x%x]", first, second, third, + argstr = sprintf("%d, %d, %d, [0x%p]", first, second, third, uptr_uaddr) } probe syscall.compat_sys_msgsnd.return = @@ -647,7 +647,7 @@ probe syscall.compat_sys_msgrcv = kernel.function("compat_sys_msgrcv") { second = $second third = $third uptr_uaddr = $uptr - argstr = sprintf("%d, %d, %d, [0x%x]", first, second, third, + argstr = sprintf("%d, %d, %d, [0x%p]", first, second, third, uptr_uaddr) } probe syscall.compat_sys_msgrcv.return = @@ -664,7 +664,7 @@ probe syscall.compat_sys_msgctl = kernel.function("compat_sys_msgctl") { first = $first second = $second uptr_uaddr = $uptr - argstr = sprintf("%d, %d, [0x%x]", first, second, uptr_uaddr) + argstr = sprintf("%d, %d, [0x%p]", first, second, uptr_uaddr) } probe syscall.compat_sys_msgctl.return = kernel.function("compat_sys_msgctl").return { @@ -682,7 +682,7 @@ probe syscall.compat_sys_shmat = kernel.function("compat_sys_shmat") { second = $second third = $third uptr_uaddr = $uptr - argstr = sprintf("%d, %d, %d, [0x%x]", first, second, third, + argstr = sprintf("%d, %d, %d, [0x%p]", first, second, third, uptr_uaddr) } probe syscall.compat_sys_shmat.return = @@ -699,7 +699,7 @@ probe syscall.compat_sys_shmctl = kernel.function("compat_sys_shmctl") { first = $first second = $second uptr_uaddr = $uptr - argstr = sprintf("%d, %d, [0x%x]", first, second, uptr_uaddr) + argstr = sprintf("%d, %d, [0x%p]", first, second, uptr_uaddr) } probe syscall.compat_sys_shmctl.return = kernel.function("compat_sys_shmctl").return { @@ -717,7 +717,7 @@ probe syscall.compat_sys_semtimedop = kernel.function("compat_sys_semtimedop") { sops_uaddr = tsems nsops = $nsops timeout_uaddr = $timeout - argstr = sprintf("%d, [0x%x], %d, %s", semid, sops_uaddr, nsops, + argstr = sprintf("%d, [0x%p], %d, %s", semid, sops_uaddr, nsops, _struct_timespec_u(timeout_uaddr)) } probe syscall.compat_sys_semtimedop.return = @@ -738,7 +738,7 @@ probe syscall.compat_sys_mq_open = kernel.function("compat_sys_mq_open") { oflag = $oflag mode = $mode u_attr_uaddr = $u_attr - argstr = sprintf("\"%s\", %d, %d, [0x%x]", name_str, oflag, mode, + argstr = sprintf("\"%s\", %d, %d, [0x%p]", name_str, oflag, mode, u_attr_uaddr) } probe syscall.compat_sys_mq_open.return = @@ -797,7 +797,7 @@ probe syscall.compat_sys_mq_notify = kernel.function("compat_sys_mq_notify") { name = "compat_sys_mq_notify" mqdes = $mqdes notification_uaddr = $u_notification - argstr = sprintf("%d, [0x%x]", mqdes, notification_uaddr) + argstr = sprintf("%d, [0x%p]", mqdes, notification_uaddr) } probe syscall.compat_sys_mq_notify.return = kernel.function("compat_sys_mq_notify").return { @@ -816,7 +816,7 @@ probe syscall.compat_sys_mq_getsetattr = mqdes = $mqdes u_mqstat_uaddr = $u_mqstat u_omqstat_uaddr = $u_omqstat - argstr = sprintf("%d, [0x%x], [0x%x]", mqdes, u_mqstat_uaddr, + argstr = sprintf("%d, [0x%p], [0x%p]", mqdes, u_mqstat_uaddr, u_omqstat_uaddr) } probe syscall.compat_sys_mq_getsetattr.return = @@ -860,7 +860,7 @@ probe syscall.compat_sys_setsockopt = kernel.function("compat_sys_setsockopt") { optname_str = _sockopt_optname_str($optname) optval_uaddr = $optval optlen = $optlen - argstr = sprintf("%d, %s, %s, [0x%x], %d", $fd, level_str, + argstr = sprintf("%d, %s, %s, [0x%p], %d", $fd, level_str, optname_str, optval_uaddr, $optlen) } probe syscall.compat_sys_setsockopt.return = @@ -883,7 +883,7 @@ probe syscall.compat_sys_getsockopt = kernel.function("compat_sys_getsockopt") { optval_uaddr = $optval /* FIXME */ optlen_uaddr = $optlen - argstr = sprintf("%d, %s, %s, [0x%x], [0x%x]", s, level_str, + argstr = sprintf("%d, %s, %s, [0x%p], [0x%p]", s, level_str, optname_str, optval_uaddr, optlen_uaddr) } probe syscall.compat_sys_getsockopt.return = @@ -902,7 +902,7 @@ probe syscall.compat_sys_sendmsg = kernel.function("compat_sys_sendmsg") { s = $fd msg_uaddr = $msg flags = $flags - argstr = sprintf("%d, [0x%x], %s", s, msg_uaddr, + argstr = sprintf("%d, [0x%p], %s", s, msg_uaddr, _send_flags_str($flags)) } probe syscall.compat_sys_sendmsg.return = @@ -921,7 +921,7 @@ probe syscall.compat_sys_recvmsg = kernel.function("compat_sys_recvmsg") { s = $fd msg_uaddr = $msg flags = $flags - argstr = sprintf("%d, [0x%x], %s", s, msg_uaddr, + argstr = sprintf("%d, [0x%p], %s", s, msg_uaddr, _send_flags_str($flags)) } probe syscall.compat_sys_recvmsg.return = @@ -937,7 +937,7 @@ probe syscall.compat_sys_socketcall = kernel.function("compat_sys_socketcall") { name = "compat_sys_socketcall" call = $call args_uaddr = $args - argstr = sprintf("%d, [0x%x]", call, args_uaddr) + argstr = sprintf("%d, [0x%p]", call, args_uaddr) } probe syscall.compat_sys_socketcall.return = kernel.function("compat_sys_socketcall").return { @@ -998,7 +998,7 @@ probe syscall.quotactl = kernel.function("sys_quotactl") { special_str = user_string($special) id = $id addr_uaddr = $addr - argstr = sprintf("%s, %s, 0x%x, [0x%x]", cmd_str, special_str, + argstr = sprintf("%s, %s, 0x%p, [0x%p]", cmd_str, special_str, id, addr_uaddr) } probe syscall.quotactl.return = kernel.function("sys_quotactl").return { @@ -1019,7 +1019,7 @@ probe syscall.request_key = kernel.function("sys_request_key") { description_uaddr = $_description callout_info_uaddr = $_callout_info destringid = $destringid - argstr = sprintf("[0x%x], [0x%x], [0x%x], 0x%x", type_uaddr, + argstr = sprintf("[0x%p], [0x%p], [0x%p], 0x%p", type_uaddr, description_uaddr, callout_info_uaddr, destringid) } probe syscall.request_key.return = kernel.function("sys_request_key").return { @@ -1053,7 +1053,7 @@ probe syscall.sys32_time = kernel.function("sys32_time") { name = "sys32_time" /* FIXME */ t_uaddr = $tloc - argstr = sprintf("[0x%x]", t_uaddr) + argstr = sprintf("[0x%p]", t_uaddr) } probe syscall.sys32_time.return = kernel.function("sys32_time").return { name = "sys32_time" @@ -1068,7 +1068,7 @@ probe syscall.ppc64_sys32_stime = kernel.function("ppc64_sys32_stime") { name = "ppc64_sys32_stime" /* FIXME */ t_uaddr = $tptr - argstr = sprintf("[0x%x]", t_uaddr) + argstr = sprintf("[0x%p]", t_uaddr) } probe syscall.ppc64_sys32_stime.return = kernel.function("ppc64_sys32_stime").return { @@ -1087,7 +1087,7 @@ probe syscall.sys32_ptrace = kernel.function("sys32_ptrace") { pid = $pid addr = $addr data = $data - argstr = sprintf("0x%x, 0x%x, 0x%x, 0x%x", request, pid, + argstr = sprintf("0x%p, 0x%p, 0x%p, 0x%p", request, pid, addr, data) } probe syscall.sys32_ptrace.return = kernel.function("sys32_ptrace").return { @@ -1113,7 +1113,7 @@ probe syscall.sys32_pause.return = kernel.function("sys32_pause").return { probe syscall.sys32_olduname = kernel.function("sys32_olduname") { name = "sys32_olduname" name_uaddr = $name - argstr = sprintf("[0x%x]", name_uaddr) + argstr = sprintf("[0x%p]", name_uaddr) } probe syscall.sys32_olduname.return = kernel.function("sys32_olduname").return { name = "sys32_olduname" @@ -1129,7 +1129,7 @@ probe syscall.sys32_sigaction = kernel.function("sys32_sigaction") { sig = $sig act_uaddr = $act oact_uaddr = $oact - argstr = sprintf("%s, [0x%x], [0x%x]", _signal_name($sig), + argstr = sprintf("%s, [0x%p], [0x%p]", _signal_name($sig), act_uaddr, oact_uaddr) } probe syscall.sys32_sigaction.return = @@ -1145,7 +1145,7 @@ probe syscall.sys32_sigaction.return = probe syscall.sys32_sigsuspend = kernel.function("sys32_sigsuspend") { name = "sys32_sigsuspend" mask = $mask - argstr = sprintf("0x%x", mask) + argstr = sprintf("0x%p", mask) } probe syscall.sys32_sigsuspend.return = kernel.function("sys32_sigsuspend").return { @@ -1161,7 +1161,7 @@ probe syscall.sys32_gettimeofday = kernel.function("sys32_gettimeofday") { name = "sys32_gettimeofday" tv_uaddr = $tv tz_uaddr = $tz - argstr = sprintf("[0x%x], [0x%x]", tv_uaddr, tz_uaddr) + argstr = sprintf("[0x%p], [0x%p]", tv_uaddr, tz_uaddr) } probe syscall.sys32_gettimeofday.return = kernel.function("sys32_gettimeofday").return { @@ -1177,7 +1177,7 @@ probe syscall.sys32_settimeofday = kernel.function("sys32_settimeofday") { name = "sys32_settimeofday" tv_uaddr = $tv tz_uaddr = $tz - argstr = sprintf("[0x%x], [0x%x]", tv_uaddr, tz_uaddr) + argstr = sprintf("[0x%p], [0x%p]", tv_uaddr, tz_uaddr) } probe syscall.sys32_settimeofday.return = kernel.function("sys32_settimeofday").return { @@ -1191,7 +1191,7 @@ probe syscall.sys32_settimeofday.return = probe syscall.sys32_sysinfo = kernel.function("sys32_sysinfo") { name = "sys32_sysinfo" info_uaddr = $info - argstr = sprintf("[0x%x]", info_uaddr) + argstr = sprintf("[0x%p]", info_uaddr) } probe syscall.sys32_sysinfo.return = kernel.function("sys32_sysinfo").return { @@ -1211,7 +1211,7 @@ probe syscall.sys32_ipc = kernel.function("sys32_ipc") { third = $third ptr_uaddr = $ptr fifth = $fifth - argstr = sprintf("%d, %d, %d, %d, [0x%x], %d", call, first, second, + argstr = sprintf("%d, %d, %d, %d, [0x%p], %d", call, first, second, third, ptr_uaddr, fifth) } probe syscall.sys32_ipc.return = kernel.function("sys32_ipc").return { @@ -1231,7 +1231,7 @@ probe syscall.sys32_sigreturn = kernel.function("sys32_sigreturn") { r6 = $r6 r7 = $r7 r8 = $r8 - argstr = sprintf("0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x", + argstr = sprintf("0x%p, 0x%p, 0x%p, 0x%p, 0x%p, 0x%p", r3, r4, r5, r6, r7, r8) } probe syscall.sys32_sigreturn.return = @@ -1246,7 +1246,7 @@ probe syscall.sys32_sigreturn.return = probe syscall.sys32_adjtimex = kernel.function("sys32_adjtimex") { name = "sys32_adjtimex" buf_uaddr = $utp - argstr = sprintf("[0x%x]", buf_uaddr) + argstr = sprintf("[0x%p]", buf_uaddr) } probe syscall.sys32_adjtimex.return = kernel.function("sys32_adjtimex").return { name = "sys32_adjtimex" @@ -1263,7 +1263,7 @@ probe syscall.sys32_getdents = kernel.function("sys32_getdents") { fd = $fd dirp_uaddr = $dirent count = $count - argstr = sprintf("%d, [0x%x], %d", fd, dirp_uaddr, count) + argstr = sprintf("%d, [0x%p], %d", fd, dirp_uaddr, count) } probe syscall.sys32_getdents.return = kernel.function("sys32_getdents").return { @@ -1277,7 +1277,7 @@ probe syscall.sys32_getdents.return = probe syscall.sys32_sysctl = kernel.function("sys32_sysctl") { name = "sys32_sysctl" args_uaddr = $args - argstr = sprintf("[0x%x]", args_uaddr) + argstr = sprintf("[0x%p]", args_uaddr) } probe syscall.sys32_sysctl.return = kernel.function("sys32_sysctl").return { @@ -1293,7 +1293,7 @@ probe syscall.sys32_sched_setparam = kernel.function("sys32_sched_setparam") { name = "sys32_sched_setparam" pid = $pid param_uaddr = $param - argstr = sprintf("%d, [0x%x]", pid, param_uaddr) + argstr = sprintf("%d, [0x%p]", pid, param_uaddr) } probe syscall.sys32_sched_setparam.return = kernel.function("sys32_sched_setparam").return { @@ -1310,7 +1310,7 @@ probe syscall.sys32_sched_rr_get_interval = kernel.function("sys32_sched_rr_get_ name = "sys32_sched_rr_get_interval" pid = $pid interval_uaddr = $interval - argstr = sprintf("%d, [0x%x]", pid, interval_uaddr) + argstr = sprintf("%d, [0x%p]", pid, interval_uaddr) } probe syscall.sys32_sched_rr_get_interval.return = kernel.function("sys32_sched_rr_get_interval").return { @@ -1331,7 +1331,7 @@ probe syscall.sys32_rt_sigreturn = kernel.function("sys32_rt_sigreturn") { r6 = $r6 r7 = $r7 r8 = $r8 - argstr = sprintf("0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x", + argstr = sprintf("0x%p, 0x%p, 0x%p, 0x%p, 0x%p, 0x%p", r3, r4, r5, r6, r7, r8) } probe syscall.sys32_rt_sigreturn.return = @@ -1350,7 +1350,7 @@ probe syscall.sys32_rt_sigaction = kernel.function("sys32_rt_sigaction") { act_uaddr = $act oact_uaddr = $oact sigsetsize = $sigsetsize - argstr = sprintf("%s, [0x%x], [0x%x], 0x%x", _signal_name($sig), + argstr = sprintf("%s, [0x%p], [0x%p], 0x%p", _signal_name($sig), act_uaddr, oact_uaddr, sigsetsize) } probe syscall.sys32_rt_sigaction.return = @@ -1370,7 +1370,7 @@ probe syscall.sys32_rt_sigprocmask = kernel.function("sys32_rt_sigprocmask") { set_uaddr = $set oset_uaddr = $oset sigsetsize = $sigsetsize - argstr = sprintf("%s, [0x%x], [0x%x], 0x%x", how_str, set_uaddr, + argstr = sprintf("%s, [0x%p], [0x%p], 0x%p", how_str, set_uaddr, oset_uaddr, sigsetsize) } probe syscall.sys32_rt_sigprocmask.return = @@ -1387,7 +1387,7 @@ probe syscall.sys32_rt_sigpending = kernel.function("sys32_rt_sigpending") { name = "sys32_rt_sigpending" set_uaddr = $set sigsetsize = $sigsetsize - argstr = sprintf("[0x%x], %d", set_uaddr, $sigsetsize) + argstr = sprintf("[0x%p], %d", set_uaddr, $sigsetsize) } probe syscall.sys32_rt_sigpending.return = kernel.function("sys32_rt_sigpending").return { @@ -1407,7 +1407,7 @@ probe syscall.sys32_rt_sigtimedwait = kernel.function("sys32_rt_sigtimedwait") { uinfo_uaddr = $uinfo uts_uaddr = $uts sigsetsize = $sigsetsize - argstr = sprintf("[0x%x], [0x%x], [0x%x], 0x%x", uthese_uaddr, + argstr = sprintf("[0x%p], [0x%p], [0x%p], 0x%p", uthese_uaddr, uinfo_uaddr, uts_uaddr, sigsetsize) } probe syscall.sys32_rt_sigtimedwait.return = @@ -1424,7 +1424,7 @@ probe syscall.sys32_rt_sigqueueinfo = kernel.function("sys32_rt_sigqueueinfo") { pid = $pid sig = $sig uinfo_uaddr = $uinfo - argstr = sprintf("0x%x, %s, [0x%x]", pid, _signal_name($sig), + argstr = sprintf("0x%p, %s, [0x%p]", pid, _signal_name($sig), uinfo_uaddr) } probe syscall.sys32_rt_sigqueueinfo.return = @@ -1457,7 +1457,7 @@ probe syscall.sys32_sendfile64 = kernel.function("sys32_sendfile64") { in_fd = $in_fd offset_uaddr = $offset count = $count - argstr = sprintf("%d, %d, [0x%x], %d", $out_fd, $in_fd, offset_uaddr, + argstr = sprintf("%d, %d, [0x%p], %d", $out_fd, $in_fd, offset_uaddr, $count) } probe syscall.sys32_sendfile64.return = @@ -1476,7 +1476,7 @@ probe syscall.ppc32_timer_create = kernel.function("ppc32_timer_create") { which_clock = $clock timer_event_spec = $ev32 created_timer_id = $timer_id - argstr = sprintf("%d, [0x%x], [0x%x]", which_clock, timer_event_spec, + argstr = sprintf("%d, [0x%p], [0x%p]", which_clock, timer_event_spec, created_timer_id) } probe syscall.ppc32_timer_create.return = @@ -1496,7 +1496,7 @@ probe syscall.compat_timer_settime = kernel.function("compat_timer_settime") { flags = $flags new_setting_uaddr = $new old_setting_uaddr = $old - argstr = sprintf("%d, %d, [0x%x], [0x%x]", timer_id, flags, + argstr = sprintf("%d, %d, [0x%p], [0x%p]", timer_id, flags, new_setting_uaddr, old_setting_uaddr) } probe syscall.compat_timer_settime.return = @@ -1513,7 +1513,7 @@ probe syscall.compat_timer_gettime = kernel.function("compat_timer_gettime") { name = "compat_timer_gettime" timer_id = $timer_id setting_uaddr = $setting - argstr = sprintf("%d, [0x%x]", timer_id, setting_uaddr) + argstr = sprintf("%d, [0x%p]", timer_id, setting_uaddr) } probe syscall.compat_timer_gettime.return = kernel.function("compat_timer_gettime").return { @@ -1529,7 +1529,7 @@ probe syscall.compat_clock_settime = kernel.function("compat_clock_settime") { name = "compat_clock_settime" which_clock = $which_clock tp_uaddr = $tp - argstr = sprintf("%d, [0x%x]", which_clock, tp_uaddr) + argstr = sprintf("%d, [0x%p]", which_clock, tp_uaddr) } probe syscall.compat_clock_settime.return = kernel.function("compat_clock_settime").return { @@ -1545,7 +1545,7 @@ probe syscall.compat_clock_gettime = kernel.function("compat_clock_gettime") { name = "compat_clock_gettime" which_clock = $which_clock tp_uaddr = $tp - argstr = sprintf("%d, [0x%x]", which_clock, tp_uaddr) + argstr = sprintf("%d, [0x%p]", which_clock, tp_uaddr) } probe syscall.compat_clock_gettime.return = kernel.function("compat_clock_gettime").return { @@ -1561,7 +1561,7 @@ probe syscall.compat_clock_getres = kernel.function("compat_clock_getres") { name = "compat_clock_getres" which_clock = $which_clock tp_uaddr = $tp - argstr = sprintf("%d, [0x%x]", which_clock, tp_uaddr) + argstr = sprintf("%d, [0x%p]", which_clock, tp_uaddr) } probe syscall.compat_clock_getres.return = kernel.function("compat_clock_getres").return { @@ -1582,7 +1582,7 @@ probe syscall.compat_clock_nanosleep = kernel.function("compat_clock_nanosleep") flag_str = "TIMER_ABSTIME" rqtp_uaddr = $rqtp rmtp_uaddr = $rmtp - argstr = sprintf("%s, %s, [0x%x], [0x%x]", clock_id_str, + argstr = sprintf("%s, %s, [0x%p], [0x%p]", clock_id_str, flag_str, rqtp_uaddr, rmtp_uaddr) } probe syscall.compat_clock_nanosleep.return = @@ -1606,7 +1606,7 @@ probe syscall.sys32_swapcontext = kernel.function("sys32_swapcontext") { r7 = $r7 r8 = $r8 regs = $regs - argstr = sprintf("[0x%x], [0x%x], %d, %d, %d, %d, [0x%x]", + argstr = sprintf("[0x%p], [0x%p], %d, %d, %d, %d, [0x%p]", old_ctx_uaddr, new_ctx_uaddr, r5, r6, r7, r8, regs) } probe syscall.sys32_swapcontext.return = @@ -1624,7 +1624,7 @@ probe syscall.sys32_utimes = kernel.function("sys32_utimes") { filename_uaddr = $filename filename = user_string($filename) tvp_uaddr = $tvs - argstr = sprintf("%s, [0x%x]", filename, tvp_uaddr) + argstr = sprintf("%s, [0x%p]", filename, tvp_uaddr) } probe syscall.sys32_utimes.return = kernel.function("sys32_utimes").return { name = "sys32_utimes" @@ -1641,7 +1641,7 @@ probe syscall.compat_statfs64 = kernel.function("compat_statfs64") { path = user_string($path) sz = $sz buf_uaddr = $buf - argstr = sprintf("%s, %d, [0x%x]", path, sz, buf_uaddr) + argstr = sprintf("%s, %d, [0x%p]", path, sz, buf_uaddr) } probe syscall.compat_statfs64.return = kernel.function("compat_statfs64").return { @@ -1658,7 +1658,7 @@ probe syscall.compat_fstatfs64 = kernel.function("compat_fstatfs64") { fd = $fd sz = $sz buf_uaddr = $buf - argstr = sprintf("%d, %d, [0x%x]", fd, sz, buf_uaddr) + argstr = sprintf("%d, %d, [0x%p]", fd, sz, buf_uaddr) } probe syscall.compat_fstatfs64.return = kernel.function("compat_fstatfs64").return { @@ -1679,7 +1679,7 @@ probe syscall.compat_mbind = kernel.function("compat_mbind") { nodemask_uaddr = $nmask maxnode = $maxnode flags = $flags - argstr = sprintf("[0x%x], %d, %d, [0x%x], %d, %d", start_uaddr, len, + argstr = sprintf("[0x%p], %d, %d, [0x%p], %d, %d", start_uaddr, len, policy, nodemask_uaddr, maxnode, flags) } probe syscall.compat_mbind.return = kernel.function("compat_mbind").return { @@ -1700,7 +1700,7 @@ probe syscall.compat_get_mempolicy = kernel.function("compat_get_mempolicy") { maxnode = $maxnode addr = $addr flags = $flags - argstr = sprintf("[0x%x], [0x%x], %d, %d", policy_uaddr, nmask_uaddr, + argstr = sprintf("[0x%p], [0x%p], %d, %d", policy_uaddr, nmask_uaddr, maxnode, addr) } probe syscall.compat_get_mempolicy.return = @@ -1718,7 +1718,7 @@ probe syscall.compat_set_mempolicy = kernel.function("compat_set_mempolicy") { policy = $mode nodemask_uaddr = $nmask maxnode = $maxnode - argstr = sprintf("%d, [0x%x], %d", policy, nodemask_uaddr, maxnode) + argstr = sprintf("%d, [0x%p], %d", policy, nodemask_uaddr, maxnode) } probe syscall.compat_set_mempolicy.return = kernel.function("compat_set_mempolicy").return { @@ -1733,7 +1733,7 @@ probe syscall.ppc64_sys_stime = kernel.function("ppc64_sys_stime") { name = "ppc64_sys_stime" /* FIXME */ t_uaddr = $tptr - argstr = sprintf("[0x%x]", t_uaddr) + argstr = sprintf("[0x%p]", t_uaddr) } probe syscall.ppc64_sys_stime.return = kernel.function("ppc64_sys_stime").return { @@ -1747,7 +1747,7 @@ probe syscall.ppc64_sys_stime.return = probe syscall.ppc64_newuname = kernel.function("ppc64_newuname") { name = "ppc64_newuname" name_uaddr = $name - argstr = sprintf("[0x%x]", name_uaddr) + argstr = sprintf("[0x%p]", name_uaddr) } probe syscall.ppc64_newuname.return = kernel.function("ppc64_newuname").return { name = "ppc64_newuname" @@ -1768,7 +1768,7 @@ probe syscall.old32_readdir = kernel.function("old32_readdir") { fd = $fd dirp_uaddr = $dirent count = $count - argstr = sprintf("%d, [0x%x], %d", fd, dirp_uaddr, count) + argstr = sprintf("%d, [0x%p], %d", fd, dirp_uaddr, count) } probe syscall.old32_readdir.return = kernel.function("old32_readdir").return { @@ -1783,7 +1783,7 @@ probe syscall.sys64_time = kernel.function("sys64_time") { name = "sys64_time" /* FIXME */ t_uaddr = $tloc - argstr = sprintf("[0x%x]", t_uaddr) + argstr = sprintf("[0x%p]", t_uaddr) } probe syscall.sys64_time.return = kernel.function("sys64_time").return { name = "sys64_time" @@ -1810,7 +1810,7 @@ probe syscall.ppc64_personality.return = probe syscall.ppc_rtas = kernel.function("ppc_rtas") { name = "ppc_rtas" uargs_uaddr = $uargs - argstr = sprintf("[0x%x]", uargs_uaddr) + argstr = sprintf("[0x%p]", uargs_uaddr) } probe syscall.ppc_rtas.return = kernel.function("ppc_rtas").return { name = "ppc_rtas" diff --git a/tapset/syscalls.stp b/tapset/syscalls.stp index c80015c5..36903b57 100644 --- a/tapset/syscalls.stp +++ b/tapset/syscalls.stp @@ -98,7 +98,7 @@ probe syscall.bdflush = kernel.function("sys_bdflush") { name = "bdflush" func = $func data = $data - argstr = sprintf("%d 0x%x",func, data) + argstr = sprintf("%d 0x%p",func, data) } probe syscall.bdflush.return = kernel.function("sys_bdflush").return { name = "bdflush" @@ -124,7 +124,7 @@ probe syscall.bind.return = kernel.function("sys_bind").return { probe syscall.brk = kernel.function("sys_brk") { name = "brk" brk = $brk - argstr = sprintf("0x%x", brk) + argstr = sprintf("0x%p", brk) } probe syscall.brk.return = kernel.function("sys_brk").return { name = "brk" @@ -143,31 +143,17 @@ probe syscall.brk.return = kernel.function("sys_brk").return { * cap_get_proc / cap_set_proc are better * functions to export. */ -/* - * asmlinkage long - * sys_capget(cap_user_header_t header, - * cap_user_data_t dataptr) - */ -probe kernel.syscall.capget = - kernel.function("sys_capget") { - name = "capget" - header_uaddr = $header - data_uaddr = $dataptr - /* - * NOTE - * These two functions are the raw kernel - * interface for getting and setting - * capabilities. The kernel API is likely - * to change and use of these functions (in - * particular the format of the cap_user_*_t - * types) is subject to change with each - * kernel revision. - */ - } -probe kernel.syscall.capget.return = - kernel.function("sys_capget").return { - name = "capget.return" - } +# long sys_capget(cap_user_header_t header, cap_user_data_t dataptr) +probe syscall.capget = kernel.function("sys_capget") { + name = "capget" + header_uaddr = $header + data_uaddr = $dataptr + argstr = sprintf("0x%p, 0x%p", $header, $dataptr) +} +probe syscall.capget.return = kernel.function("sys_capget").return { + name = "capget" + retstr = returnstr(1) +} # capset _____________________________________________________ /* * NOTE @@ -180,35 +166,18 @@ probe kernel.syscall.capget.return = * cap_get_proc / cap_set_proc are better * functions to export. */ -/* - * asmlinkage long - * sys_capset(cap_user_header_t header, - * const cap_user_data_t data) - */ -probe kernel.syscall.capset = - kernel.function("sys_capset") { - name = "capset" - header_uaddr = $header - data_uaddr = $data - /* - * NOTE - * These two functions are the raw kernel - * interface for getting and setting - * capabilities. The kernel API is likely - * to change and use of these functions (in - * particular the format of the cap_user_*_t - * types) is subject to change with each - * kernel revision. - * - * These system calls are specific to Linux. - * The portable interfaces are cap_set_proc - * and cap_get_proc. - */ - } -probe kernel.syscall.capset.return = - kernel.function("sys_capset").return { - name = "capset.return" - } +# long sys_capset(cap_user_header_t header, const cap_user_data_t data) +probe syscall.capset = kernel.function("sys_capset") { + name = "capset" + header_uaddr = $header + data_uaddr = $data + argstr = sprintf("0x%p, 0x%p", $header, $data) +} +probe syscall.capset.return = kernel.function("sys_capset").return { + name = "capset" + retstr = returnstr(1) +} + # chdir ______________________________________________________ # long sys_chdir(const char __user * filename) probe syscall.chdir = kernel.function("sys_chdir") { @@ -259,40 +228,34 @@ probe syscall.chroot.return = kernel.function("sys_chroot").return { name = "chroot" retstr = returnstr(1) } + # clock_getres _______________________________________________ -/* - * asmlinkage long - * sys_clock_getres(clockid_t which_clock, - * struct timespec __user *tp) - */ -probe kernel.syscall.clock_getres = - kernel.function("sys_clock_getres") { - name = "clock_getres" - clk_id = $which_clock - clk_id_str = _get_wc_str($which_clock) - res_uaddr = $tp - } -probe kernel.syscall.clock_getres.return = - kernel.function("sys_clock_getres").return { - name = "clock_getres.return" - } +# long sys_clock_getres(clockid_t which_clock, struct timespec __user *tp) +probe syscall.clock_getres = kernel.function("sys_clock_getres") { + name = "clock_getres" + clk_id = $which_clock + clk_id_str = _get_wc_str($which_clock) + res_uaddr = $tp + #fixme argstr +} +probe syscall.clock_getres.return = kernel.function("sys_clock_getres").return { + name = "clock_getres" + retstr = returnstr(1) +} + # clock_gettime ______________________________________________ -/* - * asmlinkage long - * sys_clock_gettime(clockid_t which_clock, - * struct timespec __user *tp) - */ -probe kernel.syscall.clock_gettime = - kernel.function("sys_clock_gettime") { - name = "clock_gettime" - clk_id = $which_clock - clk_id_str = _get_wc_str($which_clock) - tp_uaddr = $tp +# long sys_clock_gettime(clockid_t which_clock, struct timespec __user *tp) +probe syscall.clock_gettime = kernel.function("sys_clock_gettime") { + name = "clock_gettime" + clk_id = $which_clock + clk_id_str = _get_wc_str($which_clock) + tp_uaddr = $tp + #fixme argstr +} +probe syscall.clock_gettime.return = kernel.function("sys_clock_gettime").return { + name = "clock_gettime" + retstr = returnstr(1) } -probe kernel.syscall.clock_gettime.return = - kernel.function("sys_clock_gettime").return { - name = "clock_gettime.return" - } # clock_nanosleep ____________________________________________ /* * asmlinkage long @@ -632,7 +595,7 @@ probe syscall.fgetxattr = kernel.function("sys_fgetxattr") { name2 = user_string($name) value_uaddr = $value size = $size - argstr = sprintf("%d, %s, [0x%x], %d", filedes, name2, + argstr = sprintf("%d, %s, [0x%p], %d", filedes, name2, value_uaddr, size) } probe syscall.fgetxattr.return = kernel.function("sys_fgetxattr").return { @@ -646,7 +609,7 @@ probe syscall.flistxattr = kernel.function("sys_flistxattr") { filedes = $fd list_uaddr = $list size = $size - argstr = sprintf("%d, [0x%x], %d", filedes, list_uaddr, size) + argstr = sprintf("%d, [0x%p], %d", filedes, list_uaddr, size) } probe syscall.flistxattr.return = kernel.function("sys_flistxattr").return { name = "flistxattr" @@ -727,7 +690,7 @@ probe syscall.fsetxattr = kernel.function("sys_fsetxattr") { value_uaddr = $value size = $size flags = $flags - argstr = sprintf("%d, %s, [0x%x], %d, 0x%x", filedes, name2, + argstr = sprintf("%d, %s, [0x%p], %d, 0x%p", filedes, name2, value_uaddr, size, flags) } probe syscall.fsetxattr.return = kernel.function("sys_fsetxattr").return { @@ -741,7 +704,7 @@ probe syscall.fstatfs = kernel.function("sys_fstatfs") { name = "fstatfs" fd = $fd buf_uaddr = $buf - argstr = sprintf("%d, [0x%x]", fd, buf_uaddr) + argstr = sprintf("%d, [0x%p]", fd, buf_uaddr) } probe syscall.fstatfs.return = kernel.function("sys_fstatfs").return { name = "fstatfs" @@ -754,7 +717,7 @@ probe syscall.fstatfs64 = kernel.function("sys_fstatfs64") { fd = $fd sz = $sz buf_uaddr = $buf - argstr = sprintf("%d, %d, [0x%x]", fd, sz, buf_uaddr) + argstr = sprintf("%d, %d, [0x%p]", fd, sz, buf_uaddr) } probe syscall.fstatfs64.return = kernel.function("sys_fstatfs64").return { name = "fstatfs64.return" @@ -815,10 +778,10 @@ probe syscall.futex = kernel.function("sys_futex") { uaddr2_uaddr = $uaddr2 val3 = $val3 if (op == 0) - argstr = sprintf("0x%x, %s, %d, %s", $uaddr, _futex_op_str($op), + argstr = sprintf("0x%p, %s, %d, %s", $uaddr, _futex_op_str($op), $val, _struct_timespec_u($utime)) else - argstr = sprintf("0x%x, %s, %d", $uaddr, _futex_op_str($op), + argstr = sprintf("0x%p, %s, %d", $uaddr, _futex_op_str($op), $val) } probe syscall.futex.return = kernel.function("sys_futex").return { @@ -832,7 +795,7 @@ probe syscall.getcwd = kernel.function("sys_getcwd") { name = "getcwd" buf_uaddr = $buf size = $size - argstr = sprintf("[0x%x], %d", buf_uaddr, size) + argstr = sprintf("[0x%p], %d", buf_uaddr, size) } probe syscall.getcwd.return = kernel.function("sys_getcwd").return { name = "getcwd" @@ -848,7 +811,7 @@ probe syscall.getdents = kernel.function("sys_getdents") { fd = $fd dirp_uaddr = $dirent count = $count - argstr = sprintf("%d, [0x%x], %d", fd, dirp_uaddr, count) + argstr = sprintf("%d, [0x%p], %d", fd, dirp_uaddr, count) } probe syscall.getdents.return = kernel.function("sys_getdents").return { name = "getdents" @@ -864,7 +827,7 @@ probe syscall.getdents64 = kernel.function("sys_getdents64") { fd = $fd dirp_uaddr = $dirent count = $count - argstr = sprintf("%d, [0x%x], %d", fd, dirp_uaddr, count) + argstr = sprintf("%d, [0x%p], %d", fd, dirp_uaddr, count) } probe syscall.getdents64.return = kernel.function("sys_getdents64").return { name = "getdents64" @@ -907,7 +870,7 @@ probe syscall.getgroups = kernel.function("sys_getgroups") { name = "getgroups" size = $gidsetsize list_uaddr = $grouplist - argstr = sprintf("%d, [0x%x]", size, list_uaddr) + argstr = sprintf("%d, [0x%p]", size, list_uaddr) } probe syscall.getgroups.return = kernel.function("sys_getgroups").return { name = "getgroups" @@ -920,7 +883,7 @@ probe syscall.gethostname = kernel.function("sys_gethostname") { name = "gethostname" name_uaddr = $name len = $len - argstr = sprintf ("[0x%x], %d", name_uaddr, len) + argstr = sprintf ("[0x%p], %d", name_uaddr, len) } probe syscall.gethostname.return = kernel.function("sys_gethostname").return { name = "gethostname" @@ -933,7 +896,7 @@ probe syscall.getitimer = kernel.function("sys_getitimer") { name = "getitimer" which = $which value_uaddr = $value - argstr = sprintf("%s, [0x%x]", _itimer_which_str(which), value_uaddr) + argstr = sprintf("%s, [0x%p]", _itimer_which_str(which), value_uaddr) } probe syscall.getitimer.return = kernel.function("sys_getitimer").return { name = "getitimer" @@ -1020,7 +983,7 @@ probe syscall.getresgid = kernel.function("sys_getresgid") { rgid_uaddr = $rgid egid_uaddr = $egid sgid_uaddr = $sgid - argstr = sprintf("[0x%x], [0x%x], [0x%x]", rgid_uaddr, egid_uaddr, sgid_uaddr) + argstr = sprintf("[0x%p], [0x%p], [0x%p]", rgid_uaddr, egid_uaddr, sgid_uaddr) } probe syscall.getresgid.return = kernel.function("sys_getresgid").return { name = "getresgid" @@ -1036,7 +999,7 @@ probe syscall.getresgid16 = kernel.function("sys_getresgid") { rgid_uaddr = $rgid egid_uaddr = $egid sgid_uaddr = $sgid - argstr = sprintf("[0x%x], [0x%x], [0x%x]", rgid_uaddr, egid_uaddr, sgid_uaddr) + argstr = sprintf("[0x%p], [0x%p], [0x%p]", rgid_uaddr, egid_uaddr, sgid_uaddr) } probe syscall.getresgid16.return = kernel.function("sys_getresgid").return { name = "getresgid16" @@ -1052,7 +1015,7 @@ probe syscall.getresuid = kernel.function("sys_getresuid") { ruid_uaddr = $ruid euid_uaddr = $euid suid_uaddr = $suid - argstr = sprintf("[0x%x], [0x%x], [0x%x]", ruid_uaddr, euid_uaddr, suid_uaddr) + argstr = sprintf("[0x%p], [0x%p], [0x%p]", ruid_uaddr, euid_uaddr, suid_uaddr) } probe syscall.getresuid.return = kernel.function("sys_getresuid").return { name = "getresuid" @@ -1068,7 +1031,7 @@ probe syscall.getresuid16 = kernel.function("sys_getresuid") { ruid_uaddr = $ruid euid_uaddr = $euid suid_uaddr = $suid - argstr = sprintf("[0x%x], [0x%x], [0x%x]", ruid_uaddr, euid_uaddr, suid_uaddr) + argstr = sprintf("[0x%p], [0x%p], [0x%p]", ruid_uaddr, euid_uaddr, suid_uaddr) } probe syscall.getresuid16.return = kernel.function("sys_getresuid").return { name = "getresuid16" @@ -1081,7 +1044,7 @@ probe syscall.getrlimit = kernel.function("sys_getrlimit") { name = "getrlimit" resource = $resource rlim_uaddr = $rlim - argstr = sprintf("%s, [0x%x]", _rlimit_resource_str($resource), rlim_uaddr) + argstr = sprintf("%s, [0x%p]", _rlimit_resource_str($resource), rlim_uaddr) } probe syscall.getrlimit.return = kernel.function("sys_getrlimit").return { name = "getrlimit" @@ -1094,7 +1057,7 @@ probe syscall.getrusage = kernel.function("sys_getrusage") { name = "getrusage" who = $who usage_uaddr = $ru - argstr = sprintf("%s, [0x%x]",_rusage_who_str($who), usage_uaddr) + argstr = sprintf("%s, [0x%p]",_rusage_who_str($who), usage_uaddr) } probe syscall.getrusage.return = kernel.function("sys_getrusage").return { name = "getrusage" @@ -1171,7 +1134,7 @@ probe syscall.gettimeofday = kernel.function("sys_gettimeofday") { name = "gettimeofday" tv_uaddr = $tv tz_uaddr = $tz - argstr = sprintf("[0x%x], [0x%x]", tv_uaddr, tz_uaddr) + argstr = sprintf("[0x%p], [0x%p]", tv_uaddr, tz_uaddr) } probe syscall.gettimeofday.return = kernel.function("sys_gettimeofday").return { name = "gettimeofday" @@ -1198,7 +1161,7 @@ probe syscall.getxattr = kernel.function("sys_getxattr") { name2 = user_string($name) value_uaddr = $value size = $size - argstr = sprintf("%s, %s, [0x%x], %d", path, name2, + argstr = sprintf("%s, %s, [0x%p], %d", path, name2, value_uaddr, size) } probe syscall.getxattr.return = kernel.function("sys_getxattr").return { @@ -1215,7 +1178,7 @@ probe syscall.init_module = kernel.function("sys_init_module") { umod_uaddr = $umod len = $len uargs = user_string($uargs) - argstr = sprintf("[0x%x], %d, %s", umod_uaddr, len, uargs) + argstr = sprintf("[0x%p], %d, %s", umod_uaddr, len, uargs) } probe syscall.init_module.return = kernel.function("sys_init_module").return { name = "init_module" @@ -1231,7 +1194,7 @@ probe syscall.io_cancel = kernel.function("sys_io_cancel") { ctx_id = $ctx_id iocb_uaddr = $iocb result_uaddr = $result - argstr = sprintf("%d, [0x%x], [0x%x]", ctx_id, iocb_uaddr, result_uaddr) + argstr = sprintf("%d, [0x%p], [0x%p]", ctx_id, iocb_uaddr, result_uaddr) } probe syscall.io_cancel.return = kernel.function("sys_io_cancel").return { name = "io_cancel" @@ -1246,7 +1209,7 @@ probe syscall.ioctl = kernel.function("sys_ioctl") { fd = $fd request = $cmd argp = $arg - argstr = sprintf("%d, %d, [0x%x]", fd, request, argp) + argstr = sprintf("%d, %d, [0x%p]", fd, request, argp) } probe syscall.ioctl.return = kernel.function("sys_ioctl").return { name = "ioctl" @@ -1279,7 +1242,7 @@ probe syscall.io_getevents = kernel.function("sys_io_getevents") { nr = $nr events_uaddr = $events timeout_uaddr = $timeout -# argstr = sprintf("%d, %d, %d, [0x%x],") +# argstr = sprintf("%d, %d, %d, [0x%p],") } probe syscall.io_getevents.return = kernel.function("sys_io_getevents").return { name = "io_getevents" @@ -1680,7 +1643,7 @@ probe syscall.mknod = kernel.function("sys_mknod") { pathname = user_string($filename) mode = $mode dev = $dev - argstr = sprintf("%s, %s, 0x%x", pathname, _mknod_mode_str($mode), dev) + argstr = sprintf("%s, %s, 0x%p", pathname, _mknod_mode_str($mode), dev) } probe syscall.mknod.return = kernel.function("sys_mknod").return { @@ -2000,7 +1963,7 @@ probe syscall.msync = kernel.function("sys_msync") { start = $start length = $len flags = $flags - argstr = sprintf("0x%x, %d, %s",start, length, _msync_flag_str(flags)) + argstr = sprintf("0x%p, %d, %s",start, length, _msync_flag_str(flags)) } probe syscall.msync.return = kernel.function("sys_msync").return { name = "msync.return" @@ -2013,7 +1976,7 @@ probe syscall.munlock = kernel.function("sys_munlock") { name = "munlock" addr = $start len = $len - argstr = sprintf("0x%x, %d", addr, len) + argstr = sprintf("0x%p, %d", addr, len) } probe syscall.munlock.return = kernel.function("sys_munlock").return { name = "munlock" @@ -2036,7 +1999,7 @@ probe syscall.munmap = kernel.function("sys_munmap") { name = "munmap" start = $addr length = $len - argstr = sprintf("0x%x, %d", start, length) + argstr = sprintf("0x%p, %d", start, length) } probe syscall.munmap.return = kernel.function("sys_munmap").return { name = "munmap" diff --git a/tapset/syscalls2.stp b/tapset/syscalls2.stp index 428dc42c..81cd62af 100644 --- a/tapset/syscalls2.stp +++ b/tapset/syscalls2.stp @@ -28,7 +28,7 @@ probe syscall.open = kernel.function("sys_open") { flags = $flags mode = $mode if (f & 64) - argstr = sprintf("\"%s\", %s, 0x%x", filename, _sys_open_flag_str(flags), mode) + argstr = sprintf("\"%s\", %s, 0x%p", filename, _sys_open_flag_str(flags), mode) else argstr = sprintf("\"%s\", %s", filename, _sys_open_flag_str(flags)) } @@ -44,7 +44,7 @@ probe syscall.read = kernel.function("sys_read") { fd = $fd buf_uaddr = $buf count = $count - argstr = sprintf("%d, [0x%x], %d", fd, buf_uaddr, count) + argstr = sprintf("%d, [0x%p], %d", fd, buf_uaddr, count) } probe syscall.read.return = kernel.function("sys_read").return { name = "read" @@ -81,7 +81,7 @@ probe syscall.newfstat = kernel.function("sys_newfstat") { name = "newfstat" fd = $fd buf_uaddr = $statbuf - argstr = sprintf("%d, [0x%x]", fd, buf_uaddr) + argstr = sprintf("%d, [0x%p]", fd, buf_uaddr) } probe syscall.newfstat.return = kernel.function("sys_newfstat").return { name = "newfstat" @@ -97,7 +97,7 @@ probe syscall.newlstat = kernel.function("sys_newlstat") { name = "newlstat" pathname = user_string($filename) buf_uaddr = $statbuf - argstr = sprintf("\"%s\", [0x%x]", pathname, buf_uaddr) + argstr = sprintf("\"%s\", [0x%p]", pathname, buf_uaddr) } probe syscall.newlstat.return = kernel.function("sys_newlstat").return { name = "newlstat" @@ -113,7 +113,7 @@ probe syscall.newstat = kernel.function("sys_newstat") { name = "newstat" pathname = user_string($filename) buf_uaddr = $statbuf - argstr = sprintf("\"%s\", [0x%x]", pathname, buf_uaddr) + argstr = sprintf("\"%s\", [0x%p]", pathname, buf_uaddr) } probe syscall.newstat.return = kernel.function("sys_newstat").return { name = "newstat" @@ -127,7 +127,7 @@ probe syscall.newstat.return = kernel.function("sys_newstat").return { probe syscall.newuname = kernel.function("sys_newuname") { name = "newuname" name_uaddr = $name - argstr = sprintf("[0x%x]", name_uaddr) + argstr = sprintf("[0x%p]", name_uaddr) } probe syscall.newuname.return = kernel.function("sys_newuname").return { name = "newuname" @@ -145,7 +145,7 @@ probe syscall.nfsservctl = kernel.function("sys_nfsservctl") { cmd = $cmd argp_uaddr = $arg resp_uaddr = $res - argstr = sprintf("0x%x, [0x%x], [0x%x]", cmd, argp_uaddr, resp_uaddr) + argstr = sprintf("0x%p, [0x%p], [0x%p]", cmd, argp_uaddr, resp_uaddr) } probe syscall.nfsservctl.return = kernel.function("sys_nfsservctl").return { name = "nfsservctl" @@ -190,7 +190,7 @@ probe syscall.old_getrlimit = kernel.function("sys_old_getrlimit") { resource = $resource resource_str = _rlimit_resource_str($resource) rlim_uaddr = $rlim - argstr = sprintf("%s, [0x%x]", resource_str, rlim_uaddr) + argstr = sprintf("%s, [0x%p]", resource_str, rlim_uaddr) } probe syscall.old_getrlimit.return = kernel.function("sys_old_getrlimit").return { name = "old_getrlimit" @@ -237,7 +237,7 @@ probe syscall.pause.return = kernel.function("sys_pause").return { # which = $which # bus = $bus # dfn = $dfn -# argstr = sprintf("0x%x, 0x%x, 0x%x", which, bus, dfn) +# argstr = sprintf("0x%p, 0x%p, 0x%p", which, bus, dfn) #} #probe syscall.pciconfig_iobase.return = kernel.function("sys_pciconfig_iobase").return { # name = "pciconfig_iobase" @@ -261,7 +261,7 @@ probe syscall.pause.return = kernel.function("sys_pause").return { # off = $off # len = $len # buf_uaddr = $buf -# argstr = sprintf("0x%x, 0x%x, 0x%x, %d, [0x%x]", bus, dfn, off, +# argstr = sprintf("0x%p, 0x%p, 0x%p, %d, [0x%p]", bus, dfn, off, # len, buf_uaddr) #} #probe syscall.pciconfig_read.return = @@ -286,7 +286,7 @@ probe syscall.pause.return = kernel.function("sys_pause").return { # off = $off # len = $len # buf_uaddr = $buf -# argstr = sprintf("0x%x, 0x%x, 0x%x, %d, [0x%x]", bus, dfn, off, +# argstr = sprintf("0x%p, 0x%p, 0x%p, %d, [0x%p]", bus, dfn, off, # len, buf_uaddr) #} #probe syscall.pciconfig_write.return = @@ -302,7 +302,7 @@ probe syscall.pause.return = kernel.function("sys_pause").return { probe syscall.personality = kernel.function("sys_personality") { name = "personality" persona = $personality - argstr = sprintf("0x%x", persona); + argstr = sprintf("0x%p", persona); } probe syscall.personality.return = kernel.function("sys_personality").return { name = "personality" @@ -354,7 +354,7 @@ probe syscall.poll = kernel.function("sys_poll") { %: timeout = $timeout %) - argstr = sprintf("[0x%x], %d, %d", ufds_uaddr, nfds, timeout) + argstr = sprintf("[0x%p], %d, %d", ufds_uaddr, nfds, timeout) } probe syscall.poll.return = kernel.function("sys_poll").return { name = "poll" @@ -376,7 +376,7 @@ probe syscall.prctl = kernel.function("sys_prctl") { arg3 = $arg3 arg4 = $arg4 arg5 = $arg5 - argstr = sprintf("0x%x, 0x%x, 0x%x, 0x%x, 0x%x", option, arg2, arg3, + argstr = sprintf("0x%p, 0x%p, 0x%p, 0x%p, 0x%p", option, arg2, arg3, arg4, arg5) } probe syscall.prctl.return = kernel.function("sys_prctl").return { @@ -397,7 +397,7 @@ probe syscall.pread64 = kernel.function("sys_pread64") { buf_uaddr = $buf count = $count offset = $pos - argstr = sprintf("%d, [0x%x], 0x%x, 0x%x", fd, buf_uaddr, + argstr = sprintf("%d, [0x%p], 0x%p, 0x%p", fd, buf_uaddr, count, offset) } probe syscall.pread64.return = kernel.function("sys_pread64").return { @@ -418,7 +418,7 @@ probe syscall.ptrace = kernel.function("sys_ptrace") { pid = $pid addr = $addr data = $data - argstr = sprintf("0x%x, 0x%x, 0x%x, 0x%x", request, pid, + argstr = sprintf("0x%p, 0x%p, 0x%p, 0x%p", request, pid, addr, data) } probe syscall.ptrace.return = kernel.function("sys_ptrace").return { @@ -439,7 +439,7 @@ probe syscall.pwrite64 = kernel.function("sys_pwrite64") { buf_uaddr = $buf count = $count offset = $pos - argstr = sprintf("%d, [0x%x], 0x%x, 0x%x", fd, buf_uaddr, + argstr = sprintf("%d, [0x%p], 0x%p, 0x%p", fd, buf_uaddr, count, offset) } probe syscall.pwrite64.return = kernel.function("sys_pwrite64").return { @@ -458,7 +458,7 @@ probe syscall.readahead = kernel.function("sys_readahead") { fd = $fd offset = $offset count = $count - argstr = sprintf("%d, 0x%x, 0x%x", fd, offset, count) + argstr = sprintf("%d, 0x%p, 0x%p", fd, offset, count) } probe syscall.readahead.return = kernel.function("sys_readahead").return { name = "readahead" @@ -477,7 +477,7 @@ probe syscall.readlink = kernel.function("sys_readlink") { path_str = user_string(path_uaddr) buf_uaddr = $buf bufsiz = $bufsiz - argstr = sprintf("%s, [0x%x], 0x%x", path_str, buf_uaddr, bufsiz) + argstr = sprintf("%s, [0x%p], 0x%p", path_str, buf_uaddr, bufsiz) } probe syscall.readlink.return = kernel.function("sys_readlink").return { name = "readlink" @@ -497,9 +497,9 @@ probe syscall.readv = kernel.function("sys_readv") { /* FIXME: RHEL4 U3 ppc64 can't resolve $fd */ %( arch != "ppc64" %? fd = $fd - argstr = sprintf("%d, [0x%x], 0x%x", fd, vector_uaddr, count) + argstr = sprintf("%d, [0x%p], 0x%p", fd, vector_uaddr, count) %: - argstr = sprintf("unknown fd, [0x%x], 0x%x", vector_uaddr, count) + argstr = sprintf("unknown fd, [0x%p], 0x%p", vector_uaddr, count) %) } probe syscall.readv.return = kernel.function("sys_readv").return { @@ -523,7 +523,7 @@ probe syscall.reboot = kernel.function("sys_reboot") { flag = $cmd flag_str = _reboot_flag_str(flag) arg_uaddr = $arg - argstr = sprintf("%s, %s, %s, [0x%x]", magic_str, magic2_str, + argstr = sprintf("%s, %s, %s, [0x%p]", magic_str, magic2_str, flag_str, arg_uaddr) } probe syscall.reboot.return = kernel.function("sys_reboot").return { @@ -549,7 +549,7 @@ probe syscall.recv = kernel.function("sys_recvfrom") { flags_str = _recvflags_str($flags) addr_uaddr = $addr addrlen_uaddr = $addr_len - argstr = sprintf("%d, [0x%x], 0x%x, %s, [0x%x], 0x%x", + argstr = sprintf("%d, [0x%p], 0x%p, %s, [0x%p], 0x%p", s, buf_uaddr, len, flags_str, addr_uaddr, addrlen_uaddr) } @@ -576,7 +576,7 @@ probe syscall.recvfrom = kernel.function("sys_recvfrom") { flags_str = _recvflags_str($flags) addr_uaddr = $addr addrlen_uaddr = $addr_len - argstr = sprintf("%d, [0x%x], 0x%x, %s, 0x%x, 0x%x", + argstr = sprintf("%d, [0x%p], 0x%p, %s, 0x%p, 0x%p", s, buf_uaddr, len, flags_str, addr_uaddr, addrlen_uaddr) } @@ -597,7 +597,7 @@ probe syscall.recvmsg = kernel.function("sys_recvmsg") { msg_uaddr = $msg flags = $flags flags_str = _recvflags_str($flags) - argstr = sprintf("%d, [0x%x], %s", s, msg_uaddr, flags_str) + argstr = sprintf("%d, [0x%p], %s", s, msg_uaddr, flags_str) } probe syscall.recvmsg.return = kernel.function("sys_recvmsg").return { name = "recvmsg" @@ -619,7 +619,7 @@ probe syscall.remap_file_pages = kernel.function("sys_remap_file_pages") { prot = $__prot pgoff = $pgoff flags = $flags - argstr = sprintf("0x%x, 0x%x, 0x%x, 0x%x, 0x%x", start, size, prot, + argstr = sprintf("0x%p, 0x%p, 0x%p, 0x%p, 0x%p", start, size, prot, pgoff, flags) } probe syscall.remap_file_pages.return = @@ -702,7 +702,7 @@ probe syscall.rt_sigaction = kernel.function("sys_rt_sigaction") { oact_uaddr = $oact sigsetsize = $sigsetsize - argstr = sprintf("%s, [0x%x], [0x%x], 0x%x", _signal_name($sig), + argstr = sprintf("%s, [0x%p], [0x%p], 0x%p", _signal_name($sig), act_uaddr, oact_uaddr, sigsetsize) } probe syscall.rt_sigaction.return = kernel.function("sys_rt_sigaction").return { @@ -719,7 +719,7 @@ probe syscall.rt_sigpending = kernel.function("do_sigpending") { name = "rt_sigpending" set_uaddr = $set sigsetsize = $sigsetsize - argstr = sprintf("[0x%x], 0x%x", set_uaddr, sigsetsize) + argstr = sprintf("[0x%p], 0x%p", set_uaddr, sigsetsize) } probe syscall.rt_sigpending.return = kernel.function("do_sigpending").return { name = "rt_sigpending" @@ -740,7 +740,7 @@ probe syscall.rt_sigprocmask = kernel.function("sys_rt_sigprocmask") { set_uaddr = $set oset_uaddr = $oset sigsetsize = $sigsetsize - argstr = sprintf("%s, [0x%x], [0x%x], 0x%x", how_str, set_uaddr, + argstr = sprintf("%s, [0x%p], [0x%p], 0x%p", how_str, set_uaddr, oset_uaddr, sigsetsize) } probe syscall.rt_sigprocmask.return = @@ -760,7 +760,7 @@ probe syscall.rt_sigqueueinfo = kernel.function("sys_rt_sigqueueinfo") { pid = $pid sig = $sig uinfo_uaddr = $uinfo - argstr = sprintf("0x%x, %s, [0x%x]", pid, _signal_name($sig), uinfo_uaddr) + argstr = sprintf("0x%p, %s, [0x%p]", pid, _signal_name($sig), uinfo_uaddr) } probe syscall.rt_sigqueueinfo.return = kernel.function("sys_rt_sigqueueinfo").return { @@ -795,7 +795,7 @@ probe syscall.rt_sigtimedwait = kernel.function("sys_rt_sigtimedwait") { uinfo_uaddr = $uinfo uts_uaddr = $uts sigsetsize = $sigsetsize - argstr = sprintf("[0x%x], [0x%x], [0x%x], 0x%x", uthese_uaddr, + argstr = sprintf("[0x%p], [0x%p], [0x%p], 0x%p", uthese_uaddr, uinfo_uaddr, uts_uaddr, sigsetsize) } probe syscall.rt_sigtimedwait.return = @@ -815,7 +815,7 @@ probe syscall.sched_getaffinity = kernel.function("sys_sched_getaffinity") { pid = $pid len = $len mask_uaddr = $user_mask_ptr - argstr = sprintf("%d, 0x%x, [0x%x]", pid, len, mask_uaddr) + argstr = sprintf("%d, 0x%p, [0x%p]", pid, len, mask_uaddr) } probe syscall.sched_getaffinity.return = kernel.function("sys_sched_getaffinity").return { @@ -832,7 +832,7 @@ probe syscall.sched_getparam = kernel.function("sys_sched_getparam") { name = "sched_getparam" pid = $pid p_uaddr = $param - argstr = sprintf("%d, [0x%x]", pid, p_uaddr) + argstr = sprintf("%d, [0x%p]", pid, p_uaddr) } probe syscall.sched_getparam.return = kernel.function("sys_sched_getparam").return { @@ -995,7 +995,7 @@ probe syscall.semop = kernel.function("sys_semtimedop") { semid = $semid tsops_uaddr = $tsops nsops = $nsops - argstr = sprintf("%d, [0x%x], %d", semid, tsops_uaddr, nsops) + argstr = sprintf("%d, [0x%p], %d", semid, tsops_uaddr, nsops) } probe syscall.semop.return = kernel.function("sys_semtimedop").return { name = "semop" @@ -1015,7 +1015,7 @@ probe syscall.semtimedop = kernel.function("sys_semtimedop") { sops_uaddr = $tsops nsops = $nsops timeout_uaddr = $timeout - argstr = sprintf("%d, [0x%x], %d, %s", semid, sops_uaddr, nsops, + argstr = sprintf("%d, [0x%p], %d, %s", semid, sops_uaddr, nsops, _struct_timespec_u(timeout_uaddr)) } probe syscall.semtimedop.return = kernel.function("sys_semtimedop").return { @@ -1041,7 +1041,7 @@ probe syscall.send = kernel.function("sys_sendto") { flags_str = _send_flags_str($flags) to_uaddr = $addr tolen = $addr_len - argstr = sprintf("%d, [0x%x], %s, [0x%x], %d", $fd, buf_uaddr, + argstr = sprintf("%d, [0x%p], %s, [0x%p], %d", $fd, buf_uaddr, flags_str, to_uaddr, $addr_len) } probe syscall.send.return = kernel.function("sys_sendto").return { @@ -1062,7 +1062,7 @@ probe syscall.sendfile = kernel.function("sys_sendfile") { in_fd = $in_fd offset_uaddr = $offset count = $count - argstr = sprintf("%d, %d, [0x%x], %d", $out_fd, $in_fd, offset_uaddr, + argstr = sprintf("%d, %d, [0x%p], %d", $out_fd, $in_fd, offset_uaddr, $count) } probe syscall.sendfile.return = kernel.function("sys_sendfile").return { @@ -1083,7 +1083,7 @@ probe syscall.sendfile64 = kernel.function("sys_sendfile64") { in_fd = $in_fd offset_uaddr = $offset count = $count - argstr = sprintf("%d, %d, [0x%x], %d", $out_fd, $in_fd, offset_uaddr, + argstr = sprintf("%d, %d, [0x%p], %d", $out_fd, $in_fd, offset_uaddr, $count) } probe syscall.sendfile64.return = kernel.function("sys_sendfile64").return { @@ -1103,7 +1103,7 @@ probe syscall.sendmsg = kernel.function("sys_sendmsg") { msg_uaddr = $msg flags = $flags flags_str = _send_flags_str($flags) - argstr = sprintf("%d, [0x%x], %s", $fd, msg_uaddr, flags_str) + argstr = sprintf("%d, [0x%p], %s", $fd, msg_uaddr, flags_str) } probe syscall.sendmsg.return = kernel.function("sys_sendmsg").return { name = "sendmsg" @@ -1128,7 +1128,7 @@ probe syscall.sendto = kernel.function("sys_sendto") { flags_str = _send_flags_str($flags) to_uaddr = $addr tolen = $addr_len - argstr = sprintf("%d, [0x%x], %d, %s, [0x%x], %d", $fd, buf_uaddr, + argstr = sprintf("%d, [0x%p], %d, %s, [0x%p], %d", $fd, buf_uaddr, $len, flags_str, to_uaddr, $addr_len) } probe syscall.sendto.return = kernel.function("sys_sendto").return { @@ -1254,7 +1254,7 @@ probe syscall.setgroups = kernel.function("sys_setgroups") { * embedded C if need be. */ list_uaddr = $grouplist - argstr = sprintf("%d, [0x%x]", $gidsetsize, list_uaddr) + argstr = sprintf("%d, [0x%p]", $gidsetsize, list_uaddr) } probe syscall.setgroups.return = kernel.function("sys_setgroups").return { name = "setgroups" @@ -1290,7 +1290,7 @@ probe syscall.setitimer = kernel.function("sys_setitimer") { which = $which value_uaddr = $value ovalue_uaddr = $ovalue - argstr = sprintf("%s, %s, 0x%x", _itimer_which_str($which), + argstr = sprintf("%s, %s, 0x%p", _itimer_which_str($which), _struct_itimerval_u($value), $ovalue) } probe syscall.setitimer.return = kernel.function("sys_setitimer").return { @@ -1516,7 +1516,7 @@ probe syscall.setsockopt = kernel.function("sys_setsockopt") { optname_str = _sockopt_optname_str($optname) optval_uaddr = $optval optlen = $optlen - argstr = sprintf("%d, %s, %s, [0x%x], %d", $fd, level_str, + argstr = sprintf("%d, %s, %s, [0x%p], %d", $fd, level_str, optname_str, optval_uaddr, $optlen) } probe syscall.setsockopt.return = kernel.function("sys_setsockopt").return { @@ -1531,7 +1531,7 @@ probe syscall.setsockopt.return = kernel.function("sys_setsockopt").return { probe syscall.set_tid_address = kernel.function("sys_set_tid_address") { name = "set_tid_address" tidptr_uaddr = $tidptr - argstr = sprintf("[0x%x]", tidptr_uaddr) + argstr = sprintf("[0x%p]", tidptr_uaddr) } probe syscall.set_tid_address.return = kernel.function("sys_set_tid_address").return { @@ -1609,7 +1609,7 @@ probe syscall.setxattr = kernel.function("sys_setxattr") { value_uaddr = $value size = $size flags = $flags - argstr = sprintf("%s, %s, [0x%x], %d, %d", path, name_str, value_uaddr, + argstr = sprintf("%s, %s, [0x%p], %d, %d", path, name_str, value_uaddr, $size, $flags) } probe syscall.setxattr.return = kernel.function("sys_setxattr").return { @@ -1640,7 +1640,7 @@ probe syscall.shmctl = kernel.function("sys_shmctl") { shmid = $shmid cmd = $cmd buf_uaddr = $buf - argstr = sprintf("%d, %s, [0x%x]", $shmid, _semctl_cmd($cmd), + argstr = sprintf("%d, %s, [0x%p]", $shmid, _semctl_cmd($cmd), buf_uaddr) } probe syscall.shmctl.return = kernel.function("sys_shmctl").return { @@ -1655,7 +1655,7 @@ probe syscall.shmctl.return = kernel.function("sys_shmctl").return { probe syscall.shmdt = kernel.function("sys_shmdt") { name = "shmdt" shmaddr_uaddr = $shmaddr - argstr = sprintf("[0x%x]", shmaddr_uaddr) + argstr = sprintf("[0x%p]", shmaddr_uaddr) } probe syscall.shmdt.return = kernel.function("sys_shmdt").return { name = "shmdt" @@ -1706,7 +1706,7 @@ probe syscall.signal = kernel.function("sys_signal") { name = "signal" sig = $sig handler = $handler - argstr = sprintf("%s, [0x%x]", _signal_name($sig), $handler) + argstr = sprintf("%s, [0x%p]", _signal_name($sig), $handler) } probe syscall.signal.return = kernel.function("sys_signal").return { name = "signal" @@ -1732,7 +1732,7 @@ probe syscall.sigpending = kernel.function("do_sigpending") { */ set_uaddr = $set sigsetsize = $sigsetsize - argstr = sprintf("[0x%x], %d", set_uaddr, $sigsetsize) + argstr = sprintf("[0x%p], %d", set_uaddr, $sigsetsize) } probe syscall.sigpending.return = kernel.function("do_sigpending").return { name = "sigpending" @@ -1762,7 +1762,7 @@ probe syscall.sigprocmask = kernel.function("sys_sigprocmask") { */ set_uaddr = $set oldset_uaddr = $oset - argstr = sprintf("%s, [0x%x], [0x%x]", how_str, set_uaddr, + argstr = sprintf("%s, [0x%p], [0x%p]", how_str, set_uaddr, oldset_uaddr) } probe syscall.sigprocmask.return = kernel.function("sys_sigprocmask").return { @@ -1799,7 +1799,7 @@ probe syscall.socketcall = kernel.function("sys_socketcall") { name = "socketcall" call = $call args_uaddr = $args - argstr = sprintf("%d, [0x%x]", $call, args_uaddr) + argstr = sprintf("%d, [0x%p]", $call, args_uaddr) } probe syscall.socketcall.return = kernel.function("sys_socketcall").return { name = "socketcall" @@ -1819,7 +1819,7 @@ probe syscall.socketpair = kernel.function("sys_socketpair") { type = $type protocol = $protocol sv_uaddr = $usockvec - argstr = sprintf("%s, %s, %d, [0x%x]", + argstr = sprintf("%s, %s, %d, [0x%p]", _sock_family_str($family), _sock_type_str($type), $protocol, sv_uaddr) @@ -1854,7 +1854,7 @@ probe syscall.statfs = kernel.function("sys_statfs") { path_uaddr = $path path = user_string($path) buf_uaddr = $buf - argstr = sprintf("%s, [0x%x]", path, buf_uaddr) + argstr = sprintf("%s, [0x%p]", path, buf_uaddr) } probe syscall.statfs.return = kernel.function("sys_statfs").return { name = "statfs" @@ -1873,7 +1873,7 @@ probe syscall.statfs64 = kernel.function("sys_statfs64") { path = user_string($path) sz = $sz buf_uaddr = $buf - argstr = sprintf("%s, %d, [0x%x]", path, $sz, buf_uaddr) + argstr = sprintf("%s, %d, [0x%p]", path, $sz, buf_uaddr) } probe syscall.statfs64.return = kernel.function("sys_statfs64").return { name = "statfs64" @@ -1889,7 +1889,7 @@ probe syscall.stime = kernel.function("sys_stime") { t_uaddr = $tptr /* Fixme, should just use get_user? */ - argstr = sprintf("[0x%x]", t_uaddr) + argstr = sprintf("[0x%p]", t_uaddr) } probe syscall.stime.return = kernel.function("sys_stime").return { name = "stime" @@ -1963,7 +1963,7 @@ probe syscall.sync.return = kernel.function("do_sync").return { probe syscall.sysctl = kernel.function("sys_sysctl") { name = "sysctl" args_uaddr = $args - argstr = sprintf("[0x%x]", args_uaddr) + argstr = sprintf("[0x%p]", args_uaddr) } probe syscall.sysctl.return = kernel.function("sys_sysctl").return { name = "sysctl" @@ -1995,7 +1995,7 @@ probe syscall.sysfs.return = kernel.function("sys_sysfs").return { probe syscall.sysinfo = kernel.function("sys_sysinfo") { name = "sysinfo" info_uaddr = $info - argstr = sprintf("[0x%x]", info_uaddr) + argstr = sprintf("[0x%p]", info_uaddr) } probe syscall.sysinfo.return = kernel.function("sys_sysinfo").return { name = "sysinfo" @@ -2013,7 +2013,7 @@ probe syscall.syslog = kernel.function("do_syslog") { type = $type bufp_uaddr = $buf len = $len - argstr = sprintf("%d, [0x%x], %d", $type, bufp_uaddr, $len) + argstr = sprintf("%d, [0x%p], %d", $type, bufp_uaddr, $len) } probe syscall.syslog.return = kernel.function("do_syslog").return { name = "syslog" @@ -2046,7 +2046,7 @@ probe syscall.time = kernel.function("sys_time") { name = "time" t_uaddr = $tloc /* FIXME */ - argstr = sprintf("[0x%x]", t_uaddr) + argstr = sprintf("[0x%p]", t_uaddr) } probe syscall.time.return = kernel.function("sys_time").return { name = "time" @@ -2069,7 +2069,7 @@ probe syscall.timer_create = kernel.function("sys_timer_create") { * XXX NOT SAFE -- might sleep * timerid = __uget_num($created_timer_id) */ - argstr = sprintf("%d, [0x%x], [0x%x]", $which_clock, evp_uaddr, + argstr = sprintf("%d, [0x%p], [0x%p]", $which_clock, evp_uaddr, timerid_uaddr) } probe syscall.timer_create.return = @@ -2162,7 +2162,7 @@ probe syscall.times = kernel.function("sys_times") { * buf_tms_cutime = __uget_tms_m($tbuf,2) * buf_tms_cstime = __uget_tms_m($tbuf,3) */ - argstr = sprintf("[0x%x]", buf_uaddr) + argstr = sprintf("[0x%p]", buf_uaddr) } probe syscall.times.return = kernel.function("sys_times").return { name = "times" @@ -2291,7 +2291,7 @@ probe syscall.ustat = kernel.function("sys_ustat") { name = "ustat" dev = $dev ubuf_uaddr = $ubuf - argstr = sprintf("%d, [0x%x]", $dev, ubuf_uaddr) + argstr = sprintf("%d, [0x%p]", $dev, ubuf_uaddr) } probe syscall.ustat.return = kernel.function("sys_ustat").return { name = "ustat" @@ -2308,7 +2308,7 @@ probe syscall.utime = kernel.function("sys_utime") { filename_uaddr = $filename filename = user_string($filename) buf_uaddr = $times - argstr = sprintf("%s, [0x%x]", filename, buf_uaddr) + argstr = sprintf("%s, [0x%p]", filename, buf_uaddr) } probe syscall.utime.return = kernel.function("sys_utime").return { name = "utime" @@ -2359,7 +2359,7 @@ probe syscall.wait4 = kernel.function("sys_wait4") { options = $options options_str = _wait4_opt_str($options) rusage_uaddr = $ru - argstr = sprintf("%d, [0x%x], %s, [0x%x]", $pid, status_uaddr, + argstr = sprintf("%d, [0x%p], %s, [0x%p]", $pid, status_uaddr, option_str, rusage_uaddr) } @@ -2385,7 +2385,7 @@ probe syscall.waitid = kernel.function("sys_waitid") { options = $options options_str = _wait4_opt_str($options) rusage_uaddr = $ru - argstr = sprintf("%d, %d, [0x%x], %s, [0x%x]", $which, $pid, + argstr = sprintf("%d, %d, [0x%p], %s, [0x%p]", $which, $pid, infop_uaddr, options_str, rusage_uaddr) } probe syscall.waitid.return = kernel.function("sys_waitid").return { @@ -2407,7 +2407,7 @@ probe syscall.waitpid = kernel.function("sys_wait4") { options = $options options_str = _wait4_opt_str($options) rusage_uaddr = $ru - argstr = sprintf("%d, [0x%x], %s, [0x%x]", $pid, status_uaddr, + argstr = sprintf("%d, [0x%p], %s, [0x%p]", $pid, status_uaddr, options_str, rusage_uaddr) } probe syscall.waitpid.return = kernel.function("sys_wait4").return { @@ -2426,7 +2426,7 @@ probe syscall.write = kernel.function("sys_write") { fd = $fd buf_uaddr = $buf count = $count - argstr = sprintf("%d, [0x%x], %d", $fd, buf_uaddr, $count) + argstr = sprintf("%d, [0x%p], %d", $fd, buf_uaddr, $count) } probe syscall.write.return = kernel.function("sys_write").return { name = "write" @@ -2446,9 +2446,9 @@ probe syscall.writev = kernel.function("sys_writev") { /* FIXME: RHEL4 U3 ppc64 can't resolve $fd */ %( arch != "ppc64" %? fd = $fd - argstr = sprintf("%d, [0x%x], %d", $fd, vector_uaddr, $vlen) + argstr = sprintf("%d, [0x%p], %d", $fd, vector_uaddr, $vlen) %: - argstr = sprintf("unknown fd, [0x%x], %d", vector_uaddr, $vlen) + argstr = sprintf("unknown fd, [0x%p], %d", vector_uaddr, $vlen) %) } probe syscall.writev.return = kernel.function("sys_writev").return { diff --git a/tapset/x86_64/syscalls.stp b/tapset/x86_64/syscalls.stp index 5f751d16..0d8a73ee 100644 --- a/tapset/x86_64/syscalls.stp +++ b/tapset/x86_64/syscalls.stp @@ -4,7 +4,7 @@ probe syscall.fstat = kernel.function("sys_fstat") { name = "fstat" filedes = $fd buf_uaddr = $statbuf - argstr = sprintf("%d, [0x%x]", filedes, buf_uaddr) + argstr = sprintf("%d, [0x%p]", filedes, buf_uaddr) } probe syscall.fstat.return = kernel.function("sys_fstat").return { name = "fstat" @@ -47,7 +47,7 @@ probe syscall.getgroups16 = kernel.function("sys_getgroups16") { name = "getgroups16" size = $gidsetsize list_uaddr = $grouplist - argstr = sprintf("%d, [0x%x]", size, list_uaddr) + argstr = sprintf("%d, [0x%p]", size, list_uaddr) } probe syscall.getgroups16.return = kernel.function("sys_getgroups16").return { name = "getgroups16" @@ -70,7 +70,7 @@ probe syscall.lstat = kernel.function("sys_lstat") { name = "lstat" file_name = user_string($filename) buf_uaddr = $statbuf - argstr = sprintf("%s, [0x%x]", file_name, buf_uaddr) + argstr = sprintf("%s, [0x%p]", file_name, buf_uaddr) } probe syscall.lstat.return = kernel.function("sys_lstat").return { name = "lstat.return" @@ -106,7 +106,7 @@ probe syscall.stat = kernel.function("sys_stat") { filename_uaddr = $filename filename = user_string($filename) buf_uaddr = $statbuf - argstr = sprintf("%s, [0x%x]", filename, buf_uaddr) + argstr = sprintf("%s, [0x%p]", filename, buf_uaddr) } probe syscall.stat.return = kernel.function("sys_stat").return { name = "stat" @@ -160,7 +160,7 @@ probe syscall.quotactl = kernel.function("sys_quotactl") { special_str = user_string($special) id = $id addr_uaddr = $addr - argstr = sprintf("%s, %s, 0x%x, [0x%x]", cmd_str, special_str, + argstr = sprintf("%s, %s, 0x%p, [0x%p]", cmd_str, special_str, id, addr_uaddr) } probe syscall.quotactl.return = kernel.function("sys_quotactl").return { @@ -181,7 +181,7 @@ probe syscall.request_key = kernel.function("sys_request_key") { description_uaddr = $_description callout_info_uaddr = $_callout_info destringid = $destringid - argstr = sprintf("[0x%x], [0x%x], [0x%x], 0x%x", type_uaddr, + argstr = sprintf("[0x%p], [0x%p], [0x%p], 0x%p", type_uaddr, description_uaddr, callout_info_uaddr, destringid) } probe syscall.request_key.return = kernel.function("sys_request_key").return { @@ -202,7 +202,7 @@ probe kernel.syscall.arch_prctl = name = "arch_prctl" code = $code addr = $addr - argstr = sprintf("%d, 0x%x", $code, $addr) + argstr = sprintf("%d, 0x%p", $code, $addr) } probe kernel.syscall.arch_prctl.return = kernel.function("sys_arch_prctl").return { @@ -226,7 +226,7 @@ probe kernel.syscall.get_mempolicy = maxnode = $maxnode addr = $addr flags = $flags - argstr = sprintf("[0x%x], [0x%x], %d, 0x%x, %d", policy_uaddr, + argstr = sprintf("[0x%p], [0x%p], %d, 0x%p, %d", policy_uaddr, nmask_uaddr, $maxnode, $addr, $flags) } probe kernel.syscall.get_mempolicy.return = @@ -266,7 +266,7 @@ probe kernel.syscall.mbind = kernel.function("sys_mbind") { nmask_uaddr = $nmask maxnode = $maxnode flags = $flags - argstr = sprintf("%d, %d, %d, [0x%x], %d, %d", $start, $len, $mode, + argstr = sprintf("%d, %d, %d, [0x%p], %d, %d", $start, $len, $mode, nmask_uaddr, $maxnode, $flags) } probe kernel.syscall.mbind.return = kernel.function("sys_mbind").return { @@ -291,7 +291,7 @@ probe kernel.syscall.mmap = kernel.function("sys_mmap") { flags = $flags fd = $fd off = $off - argstr = sprintf("0x%x, %d, %d, %d, %d, %d", $addr, $len, + argstr = sprintf("0x%p, %d, %d, %d, %d, %d", $addr, $len, $prot, $flags, $fd, $off) } probe kernel.syscall.mmap.return = kernel.function("sys_mmap").return { @@ -329,7 +329,7 @@ probe kernel.syscall.sched_setaffinity = * doesnt like $len on x86_64 ???? */ mask_uaddr = $user_mask_ptr - argstr = sprintf("%d, %d, [0x%x]", $pid, $len, mask_uaddr) + argstr = sprintf("%d, %d, [0x%p]", $pid, $len, mask_uaddr) } probe kernel.syscall.sched_setaffinity.return = kernel.function("sys_sched_setaffinity").return { @@ -348,7 +348,7 @@ probe kernel.syscall.set_mempolicy = kernel.function("sys_set_mempolicy") { mode = $mode nmask_uaddr = $nmask maxnode = $maxnode - argstr = sprintf("%d, [0x%x], %d", $mode, nmask_uaddr, $maxnode) + argstr = sprintf("%d, [0x%p], %d", $mode, nmask_uaddr, $maxnode) } probe kernel.syscall.set_mempolicy.return = kernel.function("sys_set_mempolicy").return { @@ -365,7 +365,7 @@ probe kernel.syscall.sigaltstack = kernel.function("sys_sigaltstack") { uss_uaddr = $uss uoss_uaddr = $uoss regs_uaddr = $regs - argstr = sprintf("[0x%x], [0x%x]", uss_uaddr, uoss_uaddr) + argstr = sprintf("[0x%p], [0x%p]", uss_uaddr, uoss_uaddr) } probe kernel.syscall.sigaltstack.return = kernel.function("sys_sigaltstack").return { @@ -380,7 +380,7 @@ probe kernel.syscall.sigaltstack.return = probe kernel.syscall.time64 = kernel.function("sys_time64") { name = "time64" t_uaddr = $tloc - argstr = sprintf("[0x%x]", t_uaddr) + argstr = sprintf("[0x%p]", t_uaddr) } probe kernel.syscall.time64.return = kernel.function("sys_time64").return { name = "time64" @@ -396,7 +396,7 @@ probe kernel.syscall.tux = kernel.function("sys_tux") { name = "tux" action = $action u_info_uaddr = $u_info - argstr = sprintf("%d, [0x%x]", $action, u_info_uaddr) + argstr = sprintf("%d, [0x%p]", $action, u_info_uaddr) } probe kernel.syscall.tux.return = kernel.function("sys_tux").return { name = "tux" |