From 580f1a959f79fdd5534a5f2f8daeb415399f38ac Mon Sep 17 00:00:00 2001
From: Martin Hunt <hunt@redhat.com>
Date: Fri, 28 Mar 2008 17:01:40 -0400
Subject: dded _stp_read_address() and changed code to use it.

---
 runtime/copy.c | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

(limited to 'runtime/copy.c')

diff --git a/runtime/copy.c b/runtime/copy.c
index ef3fd223..8891f171 100644
--- a/runtime/copy.c
+++ b/runtime/copy.c
@@ -9,11 +9,10 @@
  * later version.
  */
 
-#ifndef _COPY_C_ /* -*- linux-c -*- */
+#ifndef _COPY_C_		/* -*- linux-c -*- */
 #define _COPY_C_
 
 #include "string.c"
-
 /** @file copy.c
  * @brief Functions to copy from user space.
  */
@@ -26,6 +25,28 @@
  * @{
  */
 
+/** Safely read from userspace or kernelspace.
+ * On success, returns 0. Returns -EFAULT on error.
+ *
+ * This uses __get_user() to read from userspace or
+ * kernelspace.  Will not sleep or cause pagefaults when
+ * called from within a kprobe context.
+ *
+ * @param segment . KERNEL_DS for kernel access
+ *                  USER_DS for userspace.
+ */
+
+#define _stp_read_address(x, ptr, segment)    \
+	({				      \
+		long ret;		      \
+		mm_segment_t ofs = get_fs();  \
+		set_fs(segment);	      \
+		ret = __stp_get_user(x, ptr); \
+		set_fs(ofs);		      \
+		ret;   			      \
+	})
+
+
 long _stp_strncpy_from_user(char *dst, const char __user *src, long count);
 //static long __stp_strncpy_from_user(char *dst, const char __user *src, long count);
 
@@ -110,8 +131,7 @@ do {									   \
  * <i>count</i> bytes and returns <i>count</i>.
  */
 
-long
-_stp_strncpy_from_user(char *dst, const char __user *src, long count)
+long _stp_strncpy_from_user(char *dst, const char __user *src, long count)
 {
 	long res = -EFAULT;
 	if (access_ok(VERIFY_READ, src, count))
@@ -119,7 +139,6 @@ _stp_strncpy_from_user(char *dst, const char __user *src, long count)
 	return res;
 }
 
-
 /** Copy a block of data from user space.
  *
  * If some data could not be copied, this function will pad the copied
@@ -133,8 +152,7 @@ _stp_strncpy_from_user(char *dst, const char __user *src, long count)
  *
  */
 
-unsigned long
-_stp_copy_from_user (char *dst, const char __user *src, unsigned long count)
+unsigned long _stp_copy_from_user(char *dst, const char __user *src, unsigned long count)
 {
 	if (count) {
 		if (access_ok(VERIFY_READ, src, count))
-- 
cgit 


From 20d2c2c26b42b27a4881a46364a33330b2a6ea31 Mon Sep 17 00:00:00 2001
From: Martin Hunt <hunt@redhat.com>
Date: Sun, 30 Mar 2008 19:47:51 -0400
Subject: Support for kernels built with CONFIG_FRAME_POINTER

---
 runtime/copy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime/copy.c')

diff --git a/runtime/copy.c b/runtime/copy.c
index 8891f171..6bb22762 100644
--- a/runtime/copy.c
+++ b/runtime/copy.c
@@ -1,6 +1,6 @@
 /* -*- linux-c -*- 
  * Copy from user space functions
- * Copyright (C) 2005, 2006, 2007 Red Hat Inc.
+ * Copyright (C) 2005-2008 Red Hat Inc.
  * Copyright (C) 2005 Intel Corporation.
  *
  * This file is part of systemtap, and is free software.  You can
-- 
cgit