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

Commit fc604c2a authored by Daniel Vetter's avatar Daniel Vetter Committed by Sasha Levin
Browse files

drm: Reject page_flip for !DRIVER_MODESET 



[ Upstream commit 6f00975c619064a18c23fd3aced325ae165a73b9 ]

Somehow this one slipped through, which means drivers without modeset
support can be oopsed (since those also don't call
drm_mode_config_init, which means the crtc lookup will chase an
uninitalized idr).

Reported-by: default avatarAlexander Potapenko <glider@google.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
parent a0d020d2

drivers/gpu/drm/drm_crtc.c

+3 −0
Original line number Diff line number Diff line
@@ -4583,6 +4583,9 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev, 
	unsigned long flags;

	int ret = -EINVAL;



	if (!drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;



	if (page_flip->flags & ~DRM_MODE_PAGE_FLIP_FLAGS ||

	    page_flip->reserved != 0)

		return -EINVAL;