Merge branch 'memdup_user_nul' into work.misc

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c
index de083aade105..f17cb0431833 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();