lkml.org 
[lkml]   [2011]   [Aug]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 40/41] ncpfs: Use set_current_blocked()
    Date
    From: Matt Fleming <matt.fleming@intel.com>

    As described in e6fa16ab ("signal: sigprocmask() should do
    retarget_shared_pending()") the modification of current->blocked is
    incorrect as we need to check whether the signal we're about to block
    is pending in the shared queue.

    Cc: Oleg Nesterov <oleg@redhat.com>
    Cc: Petr Vandrovec <petr@vandrovec.name>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Cc: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Matt Fleming <matt.fleming@intel.com>
    ---
    fs/ncpfs/sock.c | 12 +++++-------
    1 files changed, 5 insertions(+), 7 deletions(-)

    diff --git a/fs/ncpfs/sock.c b/fs/ncpfs/sock.c
    index 3a15872..883fdc3 100644
    --- a/fs/ncpfs/sock.c
    +++ b/fs/ncpfs/sock.c
    @@ -749,7 +749,7 @@ static int ncp_do_request(struct ncp_server *server, int size,
    return -EIO;
    }
    {
    - sigset_t old_set;
    + sigset_t old_set, blocked;
    unsigned long mask, flags;

    spin_lock_irqsave(&current->sighand->siglock, flags);
    @@ -769,16 +769,14 @@ static int ncp_do_request(struct ncp_server *server, int size,
    if (current->sighand->action[SIGQUIT - 1].sa.sa_handler == SIG_DFL)
    mask |= sigmask(SIGQUIT);
    }
    - siginitsetinv(&current->blocked, mask);
    - recalc_sigpending();
    +
    + siginitsetinv(&blocked, mask);
    + __set_task_blocked(current, &blocked);
    spin_unlock_irqrestore(&current->sighand->siglock, flags);

    result = do_ncp_rpc_call(server, size, reply, max_reply_size);

    - spin_lock_irqsave(&current->sighand->siglock, flags);
    - current->blocked = old_set;
    - recalc_sigpending();
    - spin_unlock_irqrestore(&current->sighand->siglock, flags);
    + set_current_blocked(&old_set);
    }

    DDPRINTK("do_ncp_rpc_call returned %d\n", result);
    --
    1.7.4.4


    \
     
     \ /
      Last update: 2011-08-11 16:01    [W:0.023 / U:2.784 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site