drm/i915: Fix set_caching locking
Subsystems (2)
PATCH 1/1 drm/i915: Fix set_caching locking
On the EINVAL case we don't release struct_mutex. It should be safe to grab the lock after checking the parameters, which also resolves the issues.
Signed-off-by Ben Widawsky <[email protected]>
--- drivers/gpu/drm/i915/i915_gem.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_gem.c +4 -4
@@ -3218,10 +3218,6 @@ int i915_gem_set_caching_ioctl(struct drm_device *dev, void *data,enum i915_cache_level level;int ret; - ret =i915_mutex_lock_interruptible (dev); -if (ret) -return ret; -switch (args->caching) {case I915_CACHING_NONE : level =I915_CACHE_NONE ;
@@ -3233,6 +3229,10 @@ int i915_gem_set_caching_ioctl(struct drm_device *dev, void *data,return -EINVAL ; } + ret =i915_mutex_lock_interruptible (dev); +if (ret) +return ret; + obj =to_intel_bo (drm_gem_object_lookup (dev, file, args->handle));if (&obj->base ==NULL ) { ret = -ENOENT ;
Signature · 1 line
1.7.12.1
Quoted 5 lines · Ben Widawsky
On the EINVAL case we don't release
struct_mutex. It should be safe to grab the lock after checking the parameters, which also resolves the issues.Signed-off-by Ben Widawsky <[email protected]>
Nice catch, thanks for the patch, applied to fixes. -Daniel
Quoted 37 lines
--- drivers/gpu/drm/i915/i915_gem.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/i915_gem.c +4
-4@@ -3218,10 +3218,6 @@ int i915_gem_set_caching_ioctl(struct drm_device *dev, void *data,enum i915_cache_level level;int ret; - ret =i915_mutex_lock_interruptible (dev); -if (ret) -return ret; -switch (args->caching) {case I915_CACHING_NONE : level =I915_CACHE_NONE ;@@ -3233,6 +3229,10 @@ int i915_gem_set_caching_ioctl(struct drm_device *dev, void *data,return -EINVAL ; } + ret =i915_mutex_lock_interruptible (dev); +if (ret) +return ret; + obj =to_intel_bo (drm_gem_object_lookup (dev, file, args->handle));if (&obj->base ==NULL ) { ret = -ENOENT ;Signature · 6 lines
1.7.12.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch