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

Commit 788885ae authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

drivers/gpu/drm/i915/i915_irq.c:i915_error_object_create(): use correct kmap-atomic slot 



i915_error_object_create() is called from the timer interrupt and hence
can corrupt the KM_USER0 slot.  Use KM_IRQ0 instead.

Reported-by: default avatarJaswinder Singh Rajput <jaswinderlinux@gmail.com>
Tested-by: default avatarJaswinder Singh Rajput <jaswinderlinux@gmail.com>
Acked-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Dave Airlie <airlied@linux.ie>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 06efbeb4

drivers/gpu/drm/i915/i915_irq.c

+6 −2
Original line number Diff line number Diff line
@@ -456,11 +456,15 @@ i915_error_object_create(struct drm_device *dev, 


	for (page = 0; page < page_count; page++) {

		void *s, *d = kmalloc(PAGE_SIZE, GFP_ATOMIC);

		unsigned long flags;



		if (d == NULL)

			goto unwind;

		s = kmap_atomic(src_priv->pages[page], KM_USER0);

		local_irq_save(flags);

		s = kmap_atomic(src_priv->pages[page], KM_IRQ0);

		memcpy(d, s, PAGE_SIZE);

		kunmap_atomic(s, KM_USER0);

		kunmap_atomic(s, KM_IRQ0);

		local_irq_restore(flags);

		dst->pages[page] = d;

	}

	dst->page_count = page_count;