Skip to content

Commit

Permalink
openrisc: tracehook_signal_handler() is supposed to be called on success
Browse files Browse the repository at this point in the history
... not if sigframe couldn't have been built.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed Jun 1, 2012
1 parent b7f9a11 commit 39974d0
Showing 1 changed file with 6 additions and 14 deletions.
20 changes: 6 additions & 14 deletions arch/openrisc/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
return -EFAULT;
}

static inline int
static inline void
handle_signal(unsigned long sig,
siginfo_t *info, struct k_sigaction *ka,
struct pt_regs *regs)
Expand All @@ -260,11 +260,13 @@ handle_signal(unsigned long sig,

ret = setup_rt_frame(sig, ka, info, sigmask_to_save(), regs);
if (ret)
return ret;
return;

block_sigmask(ka, sig);
clear_thread_flag(TIF_RESTORE_SIGMASK);

return 0;
tracehook_signal_handler(sig, info, ka, regs,
test_thread_flag(TIF_SINGLESTEP));
}

/*
Expand Down Expand Up @@ -341,18 +343,8 @@ void do_signal(struct pt_regs *regs)
* back */
restore_saved_sigmask();
} else { /* signr > 0 */

/* Whee! Actually deliver the signal. */
if (!handle_signal(signr, &info, &ka, regs)) {
/* a signal was successfully delivered; the saved
* sigmask will have been stored in the signal frame,
* and will be restored by sigreturn, so we can simply
* clear the TIF_RESTORE_SIGMASK flag */
clear_thread_flag(TIF_RESTORE_SIGMASK);
}

tracehook_signal_handler(signr, &info, &ka, regs,
test_thread_flag(TIF_SINGLESTEP));
handle_signal(signr, &info, &ka, regs);
}

return;
Expand Down

0 comments on commit 39974d0

Please sign in to comment.