From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from omzsmtpe02.verizonbusiness.com ([199.249.25.209]:7967 "EHLO omzsmtpe02.verizonbusiness.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751217AbdFDINC (ORCPT ); Sun, 4 Jun 2017 04:13:02 -0400 From: "Levin, Alexander (Sasha Levin)" Cc: Ben Skeggs , "Levin, Alexander (Sasha Levin)" To: "stable@vger.kernel.org" Subject: [PATCH for v4.9 LTS 043/111] drm/nouveau: prevent userspace from deleting client object Date: Sun, 4 Jun 2017 08:12:13 +0000 Message-ID: <20170604081123.19462-43-alexander.levin@verizon.com> References: <20170604081123.19462-1-alexander.levin@verizon.com> In-Reply-To: <20170604081123.19462-1-alexander.levin@verizon.com> Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org List-ID: From: Ben Skeggs [ Upstream commit c966b6279f610a24ac1d42dcbe30e10fa61220b2 ] Signed-off-by: Ben Skeggs Signed-off-by: Sasha Levin --- drivers/gpu/drm/nouveau/nouveau_usif.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_usif.c b/drivers/gpu/drm/nouve= au/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, u3= 2 argc) if (!(ret =3D nvif_unpack(-ENOSYS, &data, &size, argv->v0, 0, 0, true))) = { /* block access to objects not created via this interface */ owner =3D argv->v0.owner; - if (argv->v0.object =3D=3D 0ULL) + if (argv->v0.object =3D=3D 0ULL && + argv->v0.type !=3D NVIF_IOCTL_V0_DEL) argv->v0.owner =3D NVDRM_OBJECT_ANY; /* except client */ else argv->v0.owner =3D NVDRM_OBJECT_USIF; --=20 2.11.0