diff options
| author | David Smith <dsmith@redhat.com> | 2010-02-23 15:57:25 -0600 |
|---|---|---|
| committer | David Smith <dsmith@redhat.com> | 2010-02-23 15:57:25 -0600 |
| commit | d945a07eecee9851173365459d196bcd22c3e636 (patch) | |
| tree | acf0cf964c937f5a31216f3cfb38662252428851 /tapset/x86_64/syscalls.stp | |
| parent | 4d3c480990cdbbd3e0c405be03a195a040b4dc4a (diff) | |
| download | systemtap-steved-d945a07eecee9851173365459d196bcd22c3e636.tar.gz systemtap-steved-d945a07eecee9851173365459d196bcd22c3e636.tar.xz systemtap-steved-d945a07eecee9851173365459d196bcd22c3e636.zip | |
Fixed PR 11269 by properly handling mmap syscall 'fd' argument.
* testsuite/systemtap.syscall/mmap.c (main): Added mprotect and mremap
testing (along with testing of anonymous maps).
* tapset/i386/syscalls.stp: In mmap probes, handle the fact that the
kernel gets an unsigned long 'fd', but the user-side passes a signed
int.
* tapset/i386/nd_syscalls.stp: Ditto.
* tapset/ia64/syscalls.stp: Ditto.
* tapset/powerpc/nd_syscalls.stp: Ditto.
* tapset/powerpc/syscalls.stp: Ditto.
* tapset/x86_64/nd_syscalls.stp: Ditto.
* tapset/x86_64/syscalls.stp: Ditto.
Diffstat (limited to 'tapset/x86_64/syscalls.stp')
| -rw-r--r-- | tapset/x86_64/syscalls.stp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tapset/x86_64/syscalls.stp b/tapset/x86_64/syscalls.stp index 5ad064a2..28fa2969 100644 --- a/tapset/x86_64/syscalls.stp +++ b/tapset/x86_64/syscalls.stp @@ -85,10 +85,13 @@ probe syscall.mmap = kernel.function("sys_mmap") ? len = $len prot = $prot flags = $flags - fd = $fd + # Although the kernel gets an unsigned long fd, on the + # user-side it is a signed int. Fix this. + fd = __int32($fd) offset = $off argstr = sprintf("%p, %d, %s, %s, %d, %d", $addr, $len, - _mprotect_prot_str($prot), _mmap_flags($flags), $fd, $off) + _mprotect_prot_str($prot), _mmap_flags($flags), + __int32($fd), $off) } probe syscall.mmap.return = kernel.function("sys_mmap").return ? @@ -119,7 +122,8 @@ probe syscall.mmap2 = kernel.function("sys32_mmap2") ? { name = "mmap2" argstr = sprintf("%p, %d, %s, %s, %d, %d", $addr, $len, - _mprotect_prot_str($prot), _mmap_flags($flags), $fd, $pgoff) + _mprotect_prot_str($prot), _mmap_flags($flags), + __int32($fd), $pgoff) } probe syscall.mmap2.return = kernel.function("sys32_mmap2").return ? |