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

drm/vgem: Close use-after-free race in vgem_gem_create

There's two references floating around here (for the object reference,
not the handle_count reference, that's a different thing):

- The temporary reference held by vgem_gem_create, acquired by
creating the object and released by calling
drm_gem_object_put_unlocked.

- The reference held by the object handle, created by
drm_gem_handle_create. This one generally outlives the function,
except if a 2nd thread races with a GEM_CLOSE ioctl call.

So usually everything is correct, except in that race case, where the
access to gem_object->size could be looking at freed data already.
Which again isn't a real problem (userspace shot its feet off already
with the race, we could return garbage), but maybe someone can exploit
this as an information leak.

Cc: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Hillf Danton <hdanton@sina.com>
Reported-by: syzbot+0dc4444774d419e916c8@syzkaller.appspotmail.com
Cc: stable@vger.kernel.org
Cc: Emil Velikov <emil.velikov@collabora.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Sean Paul <seanpaul@chromium.org>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Eric Anholt <eric@anholt.net>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Rob Clark <robdclark@chromium.org>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200202132133.1891846-1-daniel.vetter@ffwll.ch

+6 -3
+6 -3
drivers/gpu/drm/vgem/vgem_drv.c
··· 196 196 return ERR_CAST(obj); 197 197 198 198 ret = drm_gem_handle_create(file, &obj->base, handle); 199 - drm_gem_object_put_unlocked(&obj->base); 200 - if (ret) 199 + if (ret) { 200 + drm_gem_object_put_unlocked(&obj->base); 201 201 return ERR_PTR(ret); 202 + } 202 203 203 204 return &obj->base; 204 205 } ··· 222 221 args->size = gem_object->size; 223 222 args->pitch = pitch; 224 223 225 - DRM_DEBUG("Created object of size %lld\n", size); 224 + drm_gem_object_put_unlocked(gem_object); 225 + 226 + DRM_DEBUG("Created object of size %llu\n", args->size); 226 227 227 228 return 0; 228 229 }