diff options
| author | Kirill A. Shutemov <kirill@shutemov.name> | 2015-11-30 03:17:31 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-12-11 05:04:44 +0100 |
| commit | 9f5bd30818c42c6c36a51f93b4df75a2ea2bd85e (patch) | |
| tree | 99f265dbc7b9ee58dfa5c0a9e2161e2d787a794d /drivers/gpu/vga | |
| parent | Merge branch 'drm-fixes-4.4' of git://people.freedesktop.org/~agd5f/linux int... (diff) | |
| download | linux-9f5bd30818c42c6c36a51f93b4df75a2ea2bd85e.tar.xz linux-9f5bd30818c42c6c36a51f93b4df75a2ea2bd85e.zip | |
vgaarb: fix signal handling in vga_get()
There are few defects in vga_get() related to signal hadning:
- we shouldn't check for pending signals for TASK_UNINTERRUPTIBLE
case;
- if we found pending signal we must remove ourself from wait queue
and change task state back to running;
- -ERESTARTSYS is more appropriate, I guess.
Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name>
Cc: stable@vger.kernel.org
Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/vga')
| -rw-r--r-- | drivers/gpu/vga/vgaarb.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c index 3166e4bc4eb6..9abcaa53bd25 100644 --- a/drivers/gpu/vga/vgaarb.c +++ b/drivers/gpu/vga/vgaarb.c @@ -395,8 +395,10 @@ int vga_get(struct pci_dev *pdev, unsigned int rsrc, int interruptible) set_current_state(interruptible ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE); - if (signal_pending(current)) { - rc = -EINTR; + if (interruptible && signal_pending(current)) { + __set_current_state(TASK_RUNNING); + remove_wait_queue(&vga_wait_queue, &wait); + rc = -ERESTARTSYS; break; } schedule(); |