diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2010-09-20 10:13:04 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-20 13:44:37 -0400 |
| commit | 20cd514d0f3d288d968217028ca67b70e707d896 (patch) | |
| tree | e6f01aab0ab568ca28fc11a9fbb575d91bafd3bd /arch | |
| parent | 31c4a3d3a0f84a5847665f8aa0552d188389f791 (diff) | |
frv: restart_block.fn needs to be reset on sigreturn
Reset restart_block.fn on executing a sigreturn such that any currently
pending system call restarts will be forced to return -EINTR.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/frv/kernel/signal.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/frv/kernel/signal.c b/arch/frv/kernel/signal.c index 0974c0ecc594..7fc29615ef01 100644 --- a/arch/frv/kernel/signal.c +++ b/arch/frv/kernel/signal.c | |||
| @@ -121,6 +121,9 @@ static int restore_sigcontext(struct sigcontext __user *sc, int *_gr8) | |||
| 121 | struct user_context *user = current->thread.user; | 121 | struct user_context *user = current->thread.user; |
| 122 | unsigned long tbr, psr; | 122 | unsigned long tbr, psr; |
| 123 | 123 | ||
| 124 | /* Always make any pending restarted system calls return -EINTR */ | ||
| 125 | current_thread_info()->restart_block.fn = do_no_restart_syscall; | ||
| 126 | |||
| 124 | tbr = user->i.tbr; | 127 | tbr = user->i.tbr; |
| 125 | psr = user->i.psr; | 128 | psr = user->i.psr; |
| 126 | if (copy_from_user(user, &sc->sc_context, sizeof(sc->sc_context))) | 129 | if (copy_from_user(user, &sc->sc_context, sizeof(sc->sc_context))) |