From: Ben Skeggs Date: Wed, 25 May 2016 07:11:40 +0000 (+1000) Subject: drm/nouveau: prevent userspace from deleting client object X-Git-Tag: v4.10-rc7~12^2~3^2~5 X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=c966b6279f610a24ac1d42dcbe30e10fa61220b2;p=karo-tx-linux.git drm/nouveau: prevent userspace from deleting client object Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/nouveau_usif.c b/drivers/gpu/drm/nouveau/nouveau_usif.c index 08f9c6fa0f7f..1fba38622744 100644 --- a/drivers/gpu/drm/nouveau/nouveau_usif.c +++ b/drivers/gpu/drm/nouveau/nouveau_usif.c @@ -313,7 +313,8 @@ usif_ioctl(struct drm_file *filp, void __user *user, u32 argc) if (!(ret = nvif_unpack(-ENOSYS, &data, &size, argv->v0, 0, 0, true))) { /* block access to objects not created via this interface */ owner = argv->v0.owner; - if (argv->v0.object == 0ULL) + if (argv->v0.object == 0ULL && + argv->v0.type != NVIF_IOCTL_V0_DEL) argv->v0.owner = NVDRM_OBJECT_ANY; /* except client */ else argv->v0.owner = NVDRM_OBJECT_USIF;