lkml.org 
[lkml]   [2013]   [Jan]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[v2.6.34-stable 32/77] Staging: comedi: fix signal handling in read and write
    Date
    From: Federico Vaga <federico.vaga@gmail.com>

    -------------------
    This is a commit scheduled for the next v2.6.34 longterm release.
    http://git.kernel.org/?p=linux/kernel/git/paulg/longterm-queue-2.6.34.git
    If you see a problem with using this for longterm, please comment.
    -------------------

    commit 6a9ce6b654e491981f6ef7e214cbd4f63e033848 upstream.

    After sleeping on a wait queue, signal_pending(current) should be
    checked (not before sleeping).

    Acked-by: Alessandro Rubini <rubini@gnudd.com>
    Signed-off-by: Federico Vaga <federico.vaga@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
    ---
    drivers/staging/comedi/comedi_fops.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
    index 48ac52b..f6a0e76 100644
    --- a/drivers/staging/comedi/comedi_fops.c
    +++ b/drivers/staging/comedi/comedi_fops.c
    @@ -1594,11 +1594,11 @@ static ssize_t comedi_write(struct file *file, const char *buf, size_t nbytes,
    retval = -EAGAIN;
    break;
    }
    + schedule();
    if (signal_pending(current)) {
    retval = -ERESTARTSYS;
    break;
    }
    - schedule();
    if (!s->busy)
    break;
    if (s->busy != file) {
    @@ -1701,11 +1701,11 @@ static ssize_t comedi_read(struct file *file, char *buf, size_t nbytes,
    retval = -EAGAIN;
    break;
    }
    + schedule();
    if (signal_pending(current)) {
    retval = -ERESTARTSYS;
    break;
    }
    - schedule();
    if (!s->busy) {
    retval = 0;
    break;
    --
    1.7.12.1


    \
     
     \ /
      Last update: 2013-01-09 03:41    [W:3.524 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site