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

Commit b1a93306 authored by Zhao Yakui's avatar Zhao Yakui Committed by Daniel Vetter
Browse files

drm/i915: Update the restrict check to filter out wrong Ring ID passed by user-space 



Signed-off-by: default avatarZhao Yakui <yakui.zhao@intel.com>
Reviewed-by: default avatarImre Deak <imre.deak@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent fd3c269f

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -1037,7 +1037,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, 
	if (args->flags & I915_EXEC_IS_PINNED)

		flags |= I915_DISPATCH_PINNED;



	if ((args->flags & I915_EXEC_RING_MASK) > I915_NUM_RINGS) {

	if ((args->flags & I915_EXEC_RING_MASK) > LAST_USER_RING) {

		DRM_DEBUG("execbuf with unknown ring: %d\n",

			  (int)(args->flags & I915_EXEC_RING_MASK));

		return -EINVAL;

drivers/gpu/drm/i915/intel_ringbuffer.h

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ struct intel_ring_buffer { 
		VECS,

	} id;

#define I915_NUM_RINGS 4

#define LAST_USER_RING (VECS + 1)

	u32		mmio_base;

	void		__iomem *virtual_start;

	struct		drm_device *dev;