Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f5bd308 authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Dave Airlie
Browse files

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: default avatarKirill A. Shutemov <kirill@shutemov.name>
Cc: stable@vger.kernel.org
Reviewed-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 49307da3

drivers/gpu/vga/vgaarb.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -395,8 +395,10 @@ int vga_get(struct pci_dev *pdev, unsigned int rsrc, int interruptible) 
		set_current_state(interruptible ?

		set_current_state(interruptible ?

				  TASK_INTERRUPTIBLE :

				  TASK_INTERRUPTIBLE :

				  TASK_UNINTERRUPTIBLE);

				  TASK_UNINTERRUPTIBLE);

		if (signal_pending(current)) {

		if (interruptible && signal_pending(current)) {

			rc = -EINTR;

			__set_current_state(TASK_RUNNING);

			remove_wait_queue(&vga_wait_queue, &wait);

			rc = -ERESTARTSYS;

			break;

			break;

		}

		}

		schedule();

		schedule();