diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-09-13 10:19:38 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-09-13 10:19:38 +1000 |
| commit | 1f8ee720cebd2a4988e2627aa0c45465778c3171 (patch) | |
| tree | c3321abb0bd869eae6df091df434093c5a004ff0 /drivers/gpu/drm/drm_atomic.c | |
| parent | eb97027f0789bd6dcfa088b66de0c287dc4ff57a (diff) | |
| parent | dec90ea1456b5a5d990d94ade2e45a2457cfd149 (diff) | |
| download | kernel_replicant_linux-1f8ee720cebd2a4988e2627aa0c45465778c3171.tar.gz kernel_replicant_linux-1f8ee720cebd2a4988e2627aa0c45465778c3171.tar.bz2 kernel_replicant_linux-1f8ee720cebd2a4988e2627aa0c45465778c3171.zip | |
Merge tag 'topic/drm-misc-2016-09-08' of git://anongit.freedesktop.org/drm-intel into drm-next
* tag 'topic/drm-misc-2016-09-08' of git://anongit.freedesktop.org/drm-intel:
drm: Fix error path in drm_mode_page_flip_ioctl()
Revert "drm: Unify handling of blob and object properties"
drm/udl: implement usb_driver suspend/resume.
drm: fix signed integer overflow
drm/atomic: Reject properties not part of the object.
drm/doc: Add a few words on validation with IGT
Diffstat (limited to 'drivers/gpu/drm/drm_atomic.c')
| -rw-r--r-- | drivers/gpu/drm/drm_atomic.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 5cb2e22d5d55..a5126e5c05ee 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -1609,7 +1609,7 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, struct drm_crtc_state *crtc_state; unsigned plane_mask; int ret = 0; - unsigned int i, j; + unsigned int i, j, k; /* disallow for drivers not supporting atomic: */ if (!drm_core_check_feature(dev, DRIVER_ATOMIC)) @@ -1691,6 +1691,15 @@ retry: goto out; } + for (k = 0; k < obj->properties->count; k++) + if (obj->properties->properties[k]->base.id == prop_id) + break; + + if (k == obj->properties->count) { + ret = -EINVAL; + goto out; + } + prop = drm_property_find(dev, prop_id); if (!prop) { drm_mode_object_unreference(obj); |