Skip to content

Commit b46e848

Browse files
richardweinbergerrichardweinberger
committed
sh: Use get_signal() signal_setup_done()
Use the more generic functions get_signal() signal_setup_done() for signal delivery. Signed-off-by: Richard Weinberger <richard@nod.at>
1 parent 2bb12b7 commit b46e848

File tree

2 files changed

+64
-97
lines changed

2 files changed

+64
-97
lines changed

‎arch/sh/kernel/signal_32.c

Lines changed: 32 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -262,17 +262,17 @@ get_sigframe(struct k_sigaction *ka, unsigned long sp, size_t frame_size)
262262
extern void __kernel_sigreturn(void);
263263
extern void __kernel_rt_sigreturn(void);
264264

265-
static int setup_frame(int sig, struct k_sigaction *ka,
266-
sigset_t *set, struct pt_regs *regs)
265+
static int setup_frame(struct ksignal *ksig, sigset_t *set,
266+
struct pt_regs *regs)
267267
{
268268
struct sigframe __user *frame;
269-
int err = 0;
269+
int err = 0, sig = ksig->sig;
270270
int signal;
271271

272-
frame = get_sigframe(ka, regs->regs[15], sizeof(*frame));
272+
frame = get_sigframe(&ksig->ka, regs->regs[15], sizeof(*frame));
273273

274274
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
275-
goto give_sigsegv;
275+
return -EFAULT;
276276

277277
signal = current_thread_info()->exec_domain
278278
&& current_thread_info()->exec_domain->signal_invmap
@@ -288,8 +288,8 @@ static int setup_frame(int sig, struct k_sigaction *ka,
288288

289289
/* Set up to return from userspace. If provided, use a stub
290290
already in userspace. */
291-
if (ka->sa.sa_flags & SA_RESTORER) {
292-
regs->pr = (unsigned long) ka->sa.sa_restorer;
291+
if (ksig->ka.sa.sa_flags & SA_RESTORER) {
292+
regs->pr = (unsigned long) ksig->ka.sa.sa_restorer;
293293
#ifdef CONFIG_VSYSCALL
294294
} else if (likely(current->mm->context.vdso)) {
295295
regs->pr = VDSO_SYM(&__kernel_sigreturn);
@@ -309,7 +309,7 @@ static int setup_frame(int sig, struct k_sigaction *ka,
309309
}
310310

311311
if (err)
312-
goto give_sigsegv;
312+
return -EFAULT;
313313

314314
/* Set up registers for signal handler */
315315
regs->regs[15] = (unsigned long) frame;
@@ -319,47 +319,43 @@ static int setup_frame(int sig, struct k_sigaction *ka,
319319

320320
if (current->personality & FDPIC_FUNCPTRS) {
321321
struct fdpic_func_descriptor __user *funcptr =
322-
(struct fdpic_func_descriptor __user *)ka->sa.sa_handler;
322+
(struct fdpic_func_descriptor __user *)ksig->ka.sa.sa_handler;
323323

324324
err |= __get_user(regs->pc, &funcptr->text);
325325
err |= __get_user(regs->regs[12], &funcptr->GOT);
326326
} else
327-
regs->pc = (unsigned long)ka->sa.sa_handler;
327+
regs->pc = (unsigned long)ksig->ka.sa.sa_handler;
328328

329329
if (err)
330-
goto give_sigsegv;
330+
return -EFAULT;
331331

332332
set_fs(USER_DS);
333333

334334
pr_debug("SIG deliver (%s:%d): sp=%p pc=%08lx pr=%08lx\n",
335335
current->comm, task_pid_nr(current), frame, regs->pc, regs->pr);
336336

337337
return 0;
338-
339-
give_sigsegv:
340-
force_sigsegv(sig, current);
341-
return -EFAULT;
342338
}
343339

344-
static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
345-
sigset_t *set, struct pt_regs *regs)
340+
static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
341+
struct pt_regs *regs)
346342
{
347343
struct rt_sigframe __user *frame;
348-
int err = 0;
344+
int err = 0, sig = ksig->sig;
349345
int signal;
350346

351-
frame = get_sigframe(ka, regs->regs[15], sizeof(*frame));
347+
frame = get_sigframe(&ksig->ka, regs->regs[15], sizeof(*frame));
352348

353349
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
354-
goto give_sigsegv;
350+
return -EFAULT;
355351

356352
signal = current_thread_info()->exec_domain
357353
&& current_thread_info()->exec_domain->signal_invmap
358354
&& sig < 32
359355
? current_thread_info()->exec_domain->signal_invmap[sig]
360356
: sig;
361357

362-
err |= copy_siginfo_to_user(&frame->info, info);
358+
err |= copy_siginfo_to_user(&frame->info, &ksig->info);
363359

364360
/* Create the ucontext. */
365361
err |= __put_user(0, &frame->uc.uc_flags);
@@ -371,8 +367,8 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
371367

372368
/* Set up to return from userspace. If provided, use a stub
373369
already in userspace. */
374-
if (ka->sa.sa_flags & SA_RESTORER) {
375-
regs->pr = (unsigned long) ka->sa.sa_restorer;
370+
if (ksig->ka.sa.sa_flags & SA_RESTORER) {
371+
regs->pr = (unsigned long) ksig->ka.sa.sa_restorer;
376372
#ifdef CONFIG_VSYSCALL
377373
} else if (likely(current->mm->context.vdso)) {
378374
regs->pr = VDSO_SYM(&__kernel_rt_sigreturn);
@@ -392,7 +388,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
392388
}
393389

394390
if (err)
395-
goto give_sigsegv;
391+
return -EFAULT;
396392

397393
/* Set up registers for signal handler */
398394
regs->regs[15] = (unsigned long) frame;
@@ -402,26 +398,22 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
402398

403399
if (current->personality & FDPIC_FUNCPTRS) {
404400
struct fdpic_func_descriptor __user *funcptr =
405-
(struct fdpic_func_descriptor __user *)ka->sa.sa_handler;
401+
(struct fdpic_func_descriptor __user *)ksig->ka.sa.sa_handler;
406402

407403
err |= __get_user(regs->pc, &funcptr->text);
408404
err |= __get_user(regs->regs[12], &funcptr->GOT);
409405
} else
410-
regs->pc = (unsigned long)ka->sa.sa_handler;
406+
regs->pc = (unsigned long)ksig->ka.sa.sa_handler;
411407

412408
if (err)
413-
goto give_sigsegv;
409+
return -EFAULT;
414410

415411
set_fs(USER_DS);
416412

417413
pr_debug("SIG deliver (%s:%d): sp=%p pc=%08lx pr=%08lx\n",
418414
current->comm, task_pid_nr(current), frame, regs->pc, regs->pr);
419415

420416
return 0;
421-
422-
give_sigsegv:
423-
force_sigsegv(sig, current);
424-
return -EFAULT;
425417
}
426418

427419
static inline void
@@ -455,22 +447,18 @@ handle_syscall_restart(unsigned long save_r0, struct pt_regs *regs,
455447
* OK, we're invoking a handler
456448
*/
457449
static void
458-
handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
459-
struct pt_regs *regs, unsigned int save_r0)
450+
handle_signal(struct ksignal *ksig, struct pt_regs *regs, unsigned int save_r0)
460451
{
461452
sigset_t *oldset = sigmask_to_save();
462453
int ret;
463454

464455
/* Set up the stack frame */
465-
if (ka->sa.sa_flags & SA_SIGINFO)
466-
ret = setup_rt_frame(sig, ka, info, oldset, regs);
456+
if (ksig->ka.sa.sa_flags & SA_SIGINFO)
457+
ret = setup_rt_frame(ksig, oldset, regs);
467458
else
468-
ret = setup_frame(sig, ka, oldset, regs);
459+
ret = setup_frame(ksig, oldset, regs);
469460

470-
if (ret)
471-
return;
472-
signal_delivered(sig, info, ka, regs,
473-
test_thread_flag(TIF_SINGLESTEP));
461+
signal_setup_done(ret, ksig, test_thread_flag(TIF_SINGLESTEP));
474462
}
475463

476464
/*
@@ -484,9 +472,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
484472
*/
485473
static void do_signal(struct pt_regs *regs, unsigned int save_r0)
486474
{
487-
siginfo_t info;
488-
int signr;
489-
struct k_sigaction ka;
475+
struct ksignal ksig;
490476

491477
/*
492478
* We want the common case to go fast, which
@@ -497,12 +483,11 @@ static void do_signal(struct pt_regs *regs, unsigned int save_r0)
497483
if (!user_mode(regs))
498484
return;
499485

500-
signr = get_signal_to_deliver(&info, &ka, regs, NULL);
501-
if (signr > 0) {
502-
handle_syscall_restart(save_r0, regs, &ka.sa);
486+
if (get_signal(&ksig)) {
487+
handle_syscall_restart(save_r0, regs, &ksig.ka.sa);
503488

504489
/* Whee! Actually deliver the signal. */
505-
handle_signal(signr, &ka, &info, regs, save_r0);
490+
handle_signal(&ksig, regs, save_r0);
506491
return;
507492
}
508493

0 commit comments

Comments
 (0)