* [PATCH 1/5] frv: restart_block.fn needs to be reset on sigreturn
@ 2010-09-18 19:41 Al Viro
0 siblings, 0 replies; 2+ messages in thread
From: Al Viro @ 2010-09-18 19:41 UTC (permalink / raw)
To: linux-arch; +Cc: dhowells, linux-kernel
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
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 0974c0e..7fc2961 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)
struct user_context *user = current->thread.user;
unsigned long tbr, psr;
+ /* Always make any pending restarted system calls return -EINTR */
+ current_thread_info()->restart_block.fn = do_no_restart_syscall;
+
tbr = user->i.tbr;
psr = user->i.psr;
if (copy_from_user(user, &sc->sc_context, sizeof(sc->sc_context)))
--
1.5.6.5
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH 1/5] frv: restart_block.fn needs to be reset on sigreturn
@ 2010-09-20 14:13 David Howells
0 siblings, 0 replies; 2+ messages in thread
From: David Howells @ 2010-09-20 14:13 UTC (permalink / raw)
To: torvalds, akpm; +Cc: linux-kernel, Al Viro, David Howells
From: Al Viro <viro@ftp.linux.org.uk>
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>
---
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 0974c0e..7fc2961 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)
struct user_context *user = current->thread.user;
unsigned long tbr, psr;
+ /* Always make any pending restarted system calls return -EINTR */
+ current_thread_info()->restart_block.fn = do_no_restart_syscall;
+
tbr = user->i.tbr;
psr = user->i.psr;
if (copy_from_user(user, &sc->sc_context, sizeof(sc->sc_context)))
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-09-20 14:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-09-18 19:41 [PATCH 1/5] frv: restart_block.fn needs to be reset on sigreturn Al Viro
2010-09-20 14:13 David Howells
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®