Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/armada: don't grab dev->struct_mutex for in mmap offset ioctl

Since David Herrmann's mmap vma manager rework we don't need to grab
dev->struct_mutex any more to prevent races when looking up the mmap
offset. Drop it and instead don't forget to use the unref_unlocked
variant (since the drm core still cares).

v2: Split out the leak fix in dump_map_offset into a separate patch as
requested by Russell. Also align labels the same way as before to
stick with local coding style.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by

Daniel Vetter and committed by
Russell King
39146d6f 8d6185b5

+2 -6
+2 -6
drivers/gpu/drm/armada/armada_gem.c
··· 274 274 struct armada_gem_object *obj; 275 275 int ret = 0; 276 276 277 - mutex_lock(&dev->struct_mutex); 278 277 obj = armada_gem_object_lookup(dev, file, handle); 279 278 if (!obj) { 280 279 DRM_ERROR("failed to lookup gem object\n"); 281 - ret = -EINVAL; 282 - goto err_unlock; 280 + return -EINVAL; 283 281 } 284 282 285 283 /* Don't allow imported objects to be mapped */ ··· 293 295 } 294 296 295 297 err_unref: 296 - drm_gem_object_unreference(&obj->obj); 297 - err_unlock: 298 - mutex_unlock(&dev->struct_mutex); 298 + drm_gem_object_unreference_unlocked(&obj->obj); 299 299 300 300 return ret; 301 301 }