diff options
| -rw-r--r-- | runtime/ChangeLog | 4 | ||||
| -rw-r--r-- | runtime/copy.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/runtime/ChangeLog b/runtime/ChangeLog index ca6b7c46..a91b1085 100644 --- a/runtime/ChangeLog +++ b/runtime/ChangeLog @@ -1,3 +1,7 @@ +2006-02-10 Martin Hunt <hunt@redhat.com> + + * copy.c (_stp_copy_from_user): Revert previous incorrect change. + 2006-02-09 Martin Hunt <hunt@redhat.com> * copy.c (_stp_copy_from_user): If access fails, 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; } |