2007-02-06 Josh Stone <joshua.i.stone@intel.com>

	* aux_syscalls.stp, inet_sock.stp, ioblock.stp, ioscheduler.stp,
	nfs.stp, nfs_proc.stp, nfsd.stp, rpc.stp, scsi.stp, signal.stp,
	socket.stp, task.stp, tcp.stp, vfs.stp: Protect pointer dereferences
	with kread wherever possible.  Some places still have hazards, as
	marked with FIXMEs.

	* errno.stp (returnstr): Don't use return in tapset C functions.
	* aux_syscalls.stp (__uget_timex_m): Ditto.
	* nfsd.stp (__get_fh): Ditto.
	* nfs.stp, vfs.stp (<many functions>): Ditto.
	* string.stp (substr): Ditto. Also make sure start index is valid.

	* syscalls.stp (syscall.execve): Change __string to kernel_string.

LKET/
	* nfs.stp, nfs_proc.stp, nfsd.stp, process.stp, tskdispatch.stp:
	Protect pointer dereferences with kread wherever possible.  Some
	places still have hazards, as marked with FIXMEs.

	* aio.stp (log_io_getevents): Don't use return in tapset C functions.
	* timestamp.stp (set_timing_method): Ditto.
	* utils.stp (filter_by_pid): Ditto.

1 files changed, 8 insertions, 13 deletions

diff --git a/tapset/inet_sock.stp b/tapset/inet_sock.stp
index 995bdcfb..b3daeb68 100644
--- a/tapset/inet_sock.stp
+++ b/tapset/inet_sock.stp
@@ -25,23 +25,18 @@
 // Get local port number
 function inet_get_local_port:long(sock:long)
 %{
-	unsigned long ptr = (unsigned long) THIS->sock;
-	struct inet_sock *inet = (struct inet_sock *) ptr;
-        THIS->__retvalue = deref(sizeof(LPORT), &(LPORT));
-        if (0) {
-deref_fault:
-            CONTEXT->last_error = "pointer dereference fault";
-        }
+	struct inet_sock *inet = (struct inet_sock *) (long) THIS->sock;
+	THIS->__retvalue = kread(&(LPORT));
+	CATCH_DEREF_FAULT();
 %}
 
 // Get IP source address string
 function inet_get_ip_source:string(sock:long)
 %{
-	unsigned long ptr = (unsigned long) THIS->sock;
-	struct inet_sock *inet = (struct inet_sock *) ptr;
-	unsigned char addr[4];
-
-	memcpy(addr, DADDR, sizeof(addr));
+	struct inet_sock *inet = (struct inet_sock *) (long) THIS->sock;
+	union { __u32 d; unsigned char addr[4]; } u;
+	u.d = kread(DADDR);
 	sprintf(THIS->__retvalue, "%d.%d.%d.%d",
-           addr[0], addr[1],  addr[2], addr[3]);
+			u.addr[0], u.addr[1], u.addr[2], u.addr[3]);
+	CATCH_DEREF_FAULT();
 %}