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

Commit 7c4eaca4 authored by Jakob Bornecrantz's avatar Jakob Bornecrantz Committed by Dave Airlie
Browse files

drm: Check for invalid cursor flags 



Signed-off-by: default avatarJakob Bornecrantz <jakob@vmware.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 22f5d115

drivers/gpu/drm/drm_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -1981,7 +1981,7 @@ int drm_mode_cursor_ioctl(struct drm_device *dev, 
	if (!drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;



	if (!req->flags)

	if (!req->flags || (~DRM_MODE_CURSOR_FLAGS & req->flags))

		return -EINVAL;



	mutex_lock(&dev->mode_config.mutex);

include/drm/drm_mode.h

+3 −2
Original line number Diff line number Diff line
@@ -359,8 +359,9 @@ struct drm_mode_mode_cmd { 
	struct drm_mode_modeinfo mode;

};



#define DRM_MODE_CURSOR_BO	(1<<0)

#define DRM_MODE_CURSOR_MOVE	(1<<1)

#define DRM_MODE_CURSOR_BO	0x01

#define DRM_MODE_CURSOR_MOVE	0x02

#define DRM_MODE_CURSOR_FLAGS	0x03



/*

 * depending on the value in flags different members are used.