diff options
| author | Kirill A. Shutemov <kirill@shutemov.name> | 2015-11-30 05:17:31 +0300 |
|---|---|---|
| committer | Zefan Li <lizefan@huawei.com> | 2016-10-26 18:15:36 +0300 |
| commit | 1405c2b764791b8b6328d1e39059fb6780beef9e (patch) | |
| tree | 5efc8efc80a0920f88d12f1a99f6cfa94ac032c8 | |
| parent | 10c6ff6e59c741a94fc1cc819755f7b76e8db2c3 (diff) | |
| download | linux-1405c2b764791b8b6328d1e39059fb6780beef9e.tar.xz | |
vgaarb: fix signal handling in vga_get()
commit 9f5bd30818c42c6c36a51f93b4df75a2ea2bd85e upstream.
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>
Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Zefan Li <lizefan@huawei.com>
| -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 111d956d8e7d..6a46d6e3377b 100644 --- a/drivers/gpu/vga/vgaarb.c +++ b/drivers/gpu/vga/vgaarb.c @@ -381,8 +381,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(); |