diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2017-04-05 18:16:14 +1000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-21 09:32:37 +0200 |
| commit | 2efa4bd3b644f115befbd225f45fce936e19cf2c (patch) | |
| tree | e66b0dd7a9cc04abd0af57b09ffcf745f898c2b8 /drivers | |
| parent | b6b2448efe6467d4bc8dabb357db120f873ed303 (diff) | |
| download | linux-stable-2efa4bd3b644f115befbd225f45fce936e19cf2c.tar.gz linux-stable-2efa4bd3b644f115befbd225f45fce936e19cf2c.tar.bz2 linux-stable-2efa4bd3b644f115befbd225f45fce936e19cf2c.zip | |
drm/nouveau/kms/nv50: fix double dma_fence_put() when destroying plane state
commit 2907e8670b6ef253bffb33bf47fd2182969cf2a0 upstream.
When the atomic support was added to nouveau, the DRM core did not do this.
However, later in the same merge window, a commit (drm/fence: add in-fences
support) was merged that added it, leading to use-after-frees of the fence
object.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_display.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c index 915c418510d3..96b510871631 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.c +++ b/drivers/gpu/drm/nouveau/nv50_display.c @@ -995,7 +995,6 @@ nv50_wndw_atomic_destroy_state(struct drm_plane *plane, { struct nv50_wndw_atom *asyw = nv50_wndw_atom(state); __drm_atomic_helper_plane_destroy_state(&asyw->state); - dma_fence_put(asyw->state.fence); kfree(asyw); } @@ -1007,7 +1006,6 @@ nv50_wndw_atomic_duplicate_state(struct drm_plane *plane) if (!(asyw = kmalloc(sizeof(*asyw), GFP_KERNEL))) return NULL; __drm_atomic_helper_plane_duplicate_state(plane, &asyw->state); - asyw->state.fence = NULL; asyw->interval = 1; asyw->sema = armw->sema; asyw->ntfy = armw->ntfy; |