diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2007-07-17 07:03:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-17 13:23:03 -0400 |
commit | f284ce7269031947326bac6bb19a977705276222 (patch) | |
tree | 8b145d42d4da182fb185dacc53b24ca7a2546114 /arch/cris | |
parent | 7664732315c97f48dba9d1e7339ad16fc5a320ac (diff) |
PTRACE_POKEDATA consolidation
Identical implementations of PTRACE_POKEDATA go into generic_ptrace_pokedata()
function.
AFAICS, fix bug on xtensa where successful PTRACE_POKEDATA will nevertheless
return EPERM.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/cris')
-rw-r--r-- | arch/cris/arch-v10/kernel/ptrace.c | 7 | ||||
-rw-r--r-- | arch/cris/arch-v32/kernel/ptrace.c | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/arch/cris/arch-v10/kernel/ptrace.c b/arch/cris/arch-v10/kernel/ptrace.c index 74b1b4dc8225..f4f9db698b44 100644 --- a/arch/cris/arch-v10/kernel/ptrace.c +++ b/arch/cris/arch-v10/kernel/ptrace.c | |||
@@ -103,12 +103,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) | |||
103 | /* Write the word at location address. */ | 103 | /* Write the word at location address. */ |
104 | case PTRACE_POKETEXT: | 104 | case PTRACE_POKETEXT: |
105 | case PTRACE_POKEDATA: | 105 | case PTRACE_POKEDATA: |
106 | ret = 0; | 106 | ret = generic_ptrace_pokedata(child, addr, data); |
107 | |||
108 | if (access_process_vm(child, addr, &data, sizeof(data), 1) == sizeof(data)) | ||
109 | break; | ||
110 | |||
111 | ret = -EIO; | ||
112 | break; | 107 | break; |
113 | 108 | ||
114 | /* Write the word at location address in the USER area. */ | 109 | /* Write the word at location address in the USER area. */ |
diff --git a/arch/cris/arch-v32/kernel/ptrace.c b/arch/cris/arch-v32/kernel/ptrace.c index d4d57b741334..38ece0cd47cb 100644 --- a/arch/cris/arch-v32/kernel/ptrace.c +++ b/arch/cris/arch-v32/kernel/ptrace.c | |||
@@ -146,12 +146,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) | |||
146 | /* Write the word at location address. */ | 146 | /* Write the word at location address. */ |
147 | case PTRACE_POKETEXT: | 147 | case PTRACE_POKETEXT: |
148 | case PTRACE_POKEDATA: | 148 | case PTRACE_POKEDATA: |
149 | ret = 0; | 149 | ret = generic_ptrace_pokedata(child, addr, data); |
150 | |||
151 | if (access_process_vm(child, addr, &data, sizeof(data), 1) == sizeof(data)) | ||
152 | break; | ||
153 | |||
154 | ret = -EIO; | ||
155 | break; | 150 | break; |
156 | 151 | ||
157 | /* Write the word at location address in the USER area. */ | 152 | /* Write the word at location address in the USER area. */ |