diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2017-06-23 15:55:15 +0200 |
|---|---|---|
| committer | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2017-06-23 15:55:15 +0200 |
| commit | 5315486b2da90bcfa1ce5c791aafebb4c3534cf1 (patch) | |
| tree | c3c215962edb82708210606574417efc1b84abe0 /drivers/gpu/drm/nouveau/nouveau_usif.c | |
| parent | 351dce074b70b19c7f8b1b737a862577e822a508 (diff) | |
| parent | 050639ef5810e8ad17fb6a426eff3c63e616350c (diff) | |
| download | linux-rt-5315486b2da90bcfa1ce5c791aafebb4c3534cf1.tar.gz | |
Merge tag 'v4.9.33' into linux-4.9.y-rt
This is the 4.9.33 stable release
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_usif.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_usif.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; |