On Sun, Mar 20, 2011 at 8:03 PM, Dave Airlie <airlied@xxxxxxxxx> wrote:
> From: Dave Airlie <airlied@xxxxxxxxxx>
>
> Noticed this while working on some other things, helps if we check for modeset
> enabled on modesetting ioctls.
Seems like a good plan to me.
Reviewed-by: Alex Deucher <alexdeucher@xxxxxxxxx>
>
> Cc: stable@xxxxxxxxxx
> Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
> ---
> drivers/gpu/drm/drm_crtc.c | 51 ++++++++++++++++++++++++++++++++++++++++++++
> 1 files changed, 51 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
> index 4c95b5f..799e149 100644
> --- a/drivers/gpu/drm/drm_crtc.c
> +++ b/drivers/gpu/drm/drm_crtc.c
> @@ -1073,6 +1073,9 @@ int drm_mode_getresources(struct drm_device *dev, void *data,
> uint32_t __user *encoder_id;
> struct drm_mode_group *mode_group;
>
> + if (!drm_core_check_feature(dev, DRIVER_MODESET))
> + return -EINVAL;
> +
> mutex_lock(&dev->mode_config.mutex);
>
> /*
> @@ -1244,6 +1247,9 @@ int drm_mode_getcrtc(struct drm_device *dev,
> struct drm_mode_object *obj;
> int ret = 0;
>
> + if (!drm_core_check_feature(dev, DRIVER_MODESET))
> + return -EINVAL;
> +
> mutex_lock(&dev->mode_config.mutex);
>
> obj = drm_mode_object_find(dev, crtc_resp->crtc_id,
> @@ -1312,6 +1318,9 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
> uint64_t __user *prop_values;
> uint32_t __user *encoder_ptr;
>
> + if (!drm_core_check_feature(dev, DRIVER_MODESET))
> + return -EINVAL;
> +
> memset(&u_mode, 0, sizeof(struct drm_mode_modeinfo));
>
> DRM_DEBUG_KMS("[CONNECTOR:%d:?]\n", out_resp->connector_id);
> @@ -1431,6 +1440,9 @@ int drm_mode_getencoder(struct drm_device *dev, void *data,
> struct drm_encoder *encoder;
> int ret = 0;
>
> + if (!drm_core_check_feature(dev, DRIVER_MODESET))
> + return -EINVAL;
> +
> mutex_lock(&dev->mode_config.mutex);
> obj = drm_mode_object_find(dev, enc_resp->encoder_id,
> DRM_MODE_OBJECT_ENCODER);
> @@ -1486,6 +1498,9 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
> int ret = 0;
> int i;
>
> + if (!drm_core_check_feature(dev, DRIVER_MODESET))
> + return -EINVAL;
> +
> mutex_lock(&dev->mode_config.mutex);
> obj = drm_mode_object_find(dev, crtc_req->crtc_id,
> DRM_MODE_OBJECT_CRTC);
> @@ -1603,6 +1618,9 @@ int drm_mode_cursor_ioctl(struct drm_device *dev,
> struct drm_crtc *crtc;
> int ret = 0;
>
> + if (!drm_core_check_feature(dev, DRIVER_MODESET))
> + return -EINVAL;
> +
> if (!req->flags) {
> DRM_ERROR("no operation set\n");
> return -EINVAL;
> @@ -1667,6 +1685,9 @@ int drm_mode_addfb(struct drm_device *dev,
> struct drm_framebuffer *fb;
> int ret = 0;
>
> + if (!drm_core_check_feature(dev, DRIVER_MODESET))
> + return -EINVAL;
> +
> if ((config->min_width > r->width) || (r->width > config->max_width)) {
> DRM_ERROR("mode new framebuffer width not within limits\n");
> return -EINVAL;
> @@ -1724,6 +1745,9 @@ int drm_mode_rmfb(struct drm_device *dev,
> int ret = 0;
> int found = 0;
>
> + if (!drm_core_check_feature(dev, DRIVER_MODESET))
> + return -EINVAL;
> +
> mutex_lock(&dev->mode_config.mutex);
> obj = drm_mode_object_find(dev, *id, DRM_MODE_OBJECT_FB);
> /* TODO check that we realy get a framebuffer back. */
> @@ -1780,6 +1804,9 @@ int drm_mode_getfb(struct drm_device *dev,
> struct drm_framebuffer *fb;
> int ret = 0;
>
> + if (!drm_core_check_feature(dev, DRIVER_MODESET))
> + return -EINVAL;
> +
> mutex_lock(&dev->mode_config.mutex);
> obj = drm_mode_object_find(dev, r->fb_id, DRM_MODE_OBJECT_FB);
> if (!obj) {
> @@ -1813,6 +1840,9 @@ int drm_mode_dirtyfb_ioctl(struct drm_device *dev,
> int num_clips;
> int ret = 0;
>
> + if (!drm_core_check_feature(dev, DRIVER_MODESET))
> + return -EINVAL;
> +
> mutex_lock(&dev->mode_config.mutex);
> obj = drm_mode_object_find(dev, r->fb_id, DRM_MODE_OBJECT_FB);
> if (!obj) {
> @@ -1996,6 +2026,9 @@ int drm_mode_attachmode_ioctl(struct drm_device *dev,
> struct drm_mode_modeinfo *umode = &mode_cmd->mode;
> int ret = 0;
>
> + if (!drm_core_check_feature(dev, DRIVER_MODESET))
> + return -EINVAL;
> +
> mutex_lock(&dev->mode_config.mutex);
>
> obj = drm_mode_object_find(dev, mode_cmd->connector_id, DRM_MODE_OBJECT_CONNECTOR);
> @@ -2042,6 +2075,9 @@ int drm_mode_detachmode_ioctl(struct drm_device *dev,
> struct drm_mode_modeinfo *umode = &mode_cmd->mode;
> int ret = 0;
>
> + if (!drm_core_check_feature(dev, DRIVER_MODESET))
> + return -EINVAL;
> +
> mutex_lock(&dev->mode_config.mutex);
>
> obj = drm_mode_object_find(dev, mode_cmd->connector_id, DRM_MODE_OBJECT_CONNECTOR);
> @@ -2211,6 +2247,9 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
> uint64_t __user *values_ptr;
> uint32_t __user *blob_length_ptr;
>
> + if (!drm_core_check_feature(dev, DRIVER_MODESET))
> + return -EINVAL;
> +
> mutex_lock(&dev->mode_config.mutex);
> obj = drm_mode_object_find(dev, out_resp->prop_id, DRM_MODE_OBJECT_PROPERTY);
> if (!obj) {
> @@ -2333,6 +2372,9 @@ int drm_mode_getblob_ioctl(struct drm_device *dev,
> int ret = 0;
> void *blob_ptr;
>
> + if (!drm_core_check_feature(dev, DRIVER_MODESET))
> + return -EINVAL;
> +
> mutex_lock(&dev->mode_config.mutex);
> obj = drm_mode_object_find(dev, out_resp->blob_id, DRM_MODE_OBJECT_BLOB);
> if (!obj) {
> @@ -2393,6 +2435,9 @@ int drm_mode_connector_property_set_ioctl(struct drm_device *dev,
> int ret = -EINVAL;
> int i;
>
> + if (!drm_core_check_feature(dev, DRIVER_MODESET))
> + return -EINVAL;
> +
> mutex_lock(&dev->mode_config.mutex);
>
> obj = drm_mode_object_find(dev, out_resp->connector_id, DRM_MODE_OBJECT_CONNECTOR);
> @@ -2509,6 +2554,9 @@ int drm_mode_gamma_set_ioctl(struct drm_device *dev,
> int size;
> int ret = 0;
>
> + if (!drm_core_check_feature(dev, DRIVER_MODESET))
> + return -EINVAL;
> +
> mutex_lock(&dev->mode_config.mutex);
> obj = drm_mode_object_find(dev, crtc_lut->crtc_id, DRM_MODE_OBJECT_CRTC);
> if (!obj) {
> @@ -2560,6 +2608,9 @@ int drm_mode_gamma_get_ioctl(struct drm_device *dev,
> int size;
> int ret = 0;
>
> + if (!drm_core_check_feature(dev, DRIVER_MODESET))
> + return -EINVAL;
> +
> mutex_lock(&dev->mode_config.mutex);
> obj = drm_mode_object_find(dev, crtc_lut->crtc_id, DRM_MODE_OBJECT_CRTC);
> if (!obj) {
> --
> 1.7.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
>
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/dri-devel
