summaryrefslogtreecommitdiffstats
path: root/runtime/copy.c
diff options
context:
space:
mode:
authorhunt <hunt>2006-02-10 21:10:40 +0000
committerhunt <hunt>2006-02-10 21:10:40 +0000
commitfd2774667c0926d26d334e286fdfc4f93071c2e9 (patch)
treec4fa9d484b746d290196a265fb4b8dc596f3838f /runtime/copy.c
parent4c57703c9d46d81d60d82ed079a1b9468d038e5c (diff)
downloadsystemtap-steved-fd2774667c0926d26d334e286fdfc4f93071c2e9.tar.gz
systemtap-steved-fd2774667c0926d26d334e286fdfc4f93071c2e9.tar.xz
systemtap-steved-fd2774667c0926d26d334e286fdfc4f93071c2e9.zip
2006-02-10 Martin Hunt <hunt@redhat.com>
* copy.c (_stp_copy_from_user): Revert previous incorrect change.
Diffstat (limited to 'runtime/copy.c')
-rw-r--r--runtime/copy.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/runtime/copy.c b/runtime/copy.c
index 0822902d..75a185c4 100644
--- a/runtime/copy.c
+++ b/runtime/copy.c
@@ -1,6 +1,6 @@
/* -*- linux-c -*-
* Copy from user space functions
- * Copyright (C) 2005 Red Hat Inc.
+ * Copyright (C) 2005, 2006 Red Hat Inc.
* Copyright (C) 2005 Intel Corporation.
*
* This file is part of systemtap, and is free software. You can
@@ -157,10 +157,8 @@ _stp_copy_from_user (char *dst, const char __user *src, unsigned long count)
if (count) {
if (access_ok(VERIFY_READ, src, count))
count = __copy_from_user_inatomic(dst, src, count);
- else {
+ else
memset(dst, 0, count);
- count = -1;
- }
}
return count;
}