From d945a07eecee9851173365459d196bcd22c3e636 Mon Sep 17 00:00:00 2001
From: David Smith <dsmith@redhat.com>
Date: Tue, 23 Feb 2010 15:57:25 -0600
Subject: 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.
---
 tapset/powerpc/nd_syscalls.stp | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'tapset/powerpc/nd_syscalls.stp')

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),
-- 
cgit