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/powerpc | |
| 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/powerpc')
| -rw-r--r-- | tapset/powerpc/nd_syscalls.stp | 18 | ||||
| -rw-r--r-- | tapset/powerpc/syscalls.stp | 13 |
2 files changed, 21 insertions, 10 deletions
diff --git a/tapset/powerpc/nd_syscalls.stp b/tapset/powerpc/nd_syscalls.stp index 46267507..0723c393 100644 --- a/tapset/powerpc/nd_syscalls.stp +++ b/tapset/powerpc/nd_syscalls.stp @@ -637,19 +637,23 @@ probe nd_syscall.mmap = kprobe.function("sys_mmap") ? // len = $len // prot = $prot // flags = $flags - // fd = $fd + // fd = __int32($fd) // offset = $offset // argstr = sprintf("%p, %d, %s, %s, %d, %d", $addr, $len, - // _mprotect_prot_str($prot), _mmap_flags($flags), $fd, $offset) + // _mprotect_prot_str($prot), _mmap_flags($flags), + // __int32($fd), $offset) asmlinkage() start = ulong_arg(1) len = ulong_arg(2) prot = ulong_arg(3) flags = ulong_arg(4) - fd = ulong_arg(5) + # Although the kernel gets an unsigned long fd, on the + # user-side it is a signed int. Fix this. + fd = int_arg(5) offset = ulong_arg(6) argstr = sprintf("%p, %d, %s, %s, %d, %d", start, len, - _mprotect_prot_str(prot), _mmap_flags(flags), fd, offset) + _mprotect_prot_str(prot), _mmap_flags(flags), + fd, offset) } probe nd_syscall.mmap.return = kprobe.function("sys_mmap").return ? { @@ -673,7 +677,7 @@ probe nd_syscall.mmap2 = kprobe.function("sys_mmap2") ?, // length = $len // prot = $prot // flags = $flags - // fd = $fd + // fd = __int32($fd) // pgoffset = $pgoff // argstr = sprintf("%p, %d, %s, %s, %d, %d", $addr, // $len, _mprotect_prot_str($prot), _mmap_flags($flags), @@ -683,7 +687,9 @@ probe nd_syscall.mmap2 = kprobe.function("sys_mmap2") ?, length = ulong_arg(2) prot = ulong_arg(3) flags = ulong_arg(4) - fd = ulong_arg(5) + # Although the kernel gets an unsigned long fd, on the + # user-side it is a signed int. Fix this. + fd = int_arg(5) pgoffset = ulong_arg(6) argstr = sprintf("%p, %d, %s, %s, %d, %d", start, length, _mprotect_prot_str(prot), _mmap_flags(flags), diff --git a/tapset/powerpc/syscalls.stp b/tapset/powerpc/syscalls.stp index 0518d486..aa90eb92 100644 --- a/tapset/powerpc/syscalls.stp +++ b/tapset/powerpc/syscalls.stp @@ -511,10 +511,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 = $offset argstr = sprintf("%p, %d, %s, %s, %d, %d", $addr, $len, - _mprotect_prot_str($prot), _mmap_flags($flags), $fd, $offset) + _mprotect_prot_str($prot), _mmap_flags($flags), + __int32($fd), $offset) } probe syscall.mmap.return = kernel.function("sys_mmap").return ? @@ -539,11 +542,13 @@ probe syscall.mmap2 = kernel.function("sys_mmap2") ?, length = $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) pgoffset = $pgoff argstr = sprintf("%p, %d, %s, %s, %d, %d", $addr, $len, _mprotect_prot_str($prot), _mmap_flags($flags), - $fd, $pgoff) + __int32($fd), $pgoff) } probe syscall.mmap2.return = kernel.function("sys_mmap2").return ?, kernel.function("compat_sys_mmap2").return ? |