lkml.org 
[lkml]   [2011]   [Aug]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 38/43] xtensa: Don't mask signals if we fail to setup signal stack
    Date
    From: Matt Fleming <matt.fleming@intel.com>

    setup_frame() needs to return an indication of whether it succeeded or
    failed in setting up the signal stack frame. If setup_frame() fails
    then we must not modify current->blocked.

    Acked-by: Oleg Nesterov <oleg@redhat.com>
    Cc: Chris Zankel <chris@zankel.net>
    Signed-off-by: Matt Fleming <matt.fleming@intel.com>
    ---
    arch/xtensa/kernel/signal.c | 11 +++++++----
    1 files changed, 7 insertions(+), 4 deletions(-)

    diff --git a/arch/xtensa/kernel/signal.c b/arch/xtensa/kernel/signal.c
    index 24655e3..17ceab8 100644
    --- a/arch/xtensa/kernel/signal.c
    +++ b/arch/xtensa/kernel/signal.c
    @@ -336,8 +336,8 @@ gen_return_code(unsigned char *codemem)
    }


    -static void setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
    - sigset_t *set, struct pt_regs *regs)
    +static int setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
    + sigset_t *set, struct pt_regs *regs)
    {
    struct rt_sigframe *frame;
    int err = 0;
    @@ -422,10 +422,11 @@ static void setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
    current->comm, current->pid, signal, frame, regs->pc);
    #endif

    - return;
    + return 0;

    give_sigsegv:
    force_sigsegv(sig, current);
    + return -EFAULT;
    }

    /*
    @@ -534,7 +535,9 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset)

    /* Whee! Actually deliver the signal. */
    /* Set up the stack frame */
    - setup_frame(signr, &ka, &info, oldset, regs);
    + ret = setup_frame(signr, &ka, &info, oldset, regs);
    + if (ret)
    + return ret;

    spin_lock_irq(&current->sighand->siglock);
    sigorsets(&current->blocked, &current->blocked, &ka.sa.sa_mask);
    --
    1.7.4.4


    \
     
     \ /
      Last update: 2011-08-19 18:53    [W:0.021 / U:29.772 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site