diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2013-09-17 14:13:32 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2013-09-18 00:16:29 +1000 |
| commit | 7a59cc34a3d7b97a00829613bb1a630f5004643b (patch) | |
| tree | affe3780d3f954f829719b6d34ca6404c104ef38 | |
| parent | 6b19e47dc11ea567ce330098fe9db3b7337e9f34 (diff) | |
| download | op-kernel-dev-7a59cc34a3d7b97a00829613bb1a630f5004643b.zip op-kernel-dev-7a59cc34a3d7b97a00829613bb1a630f5004643b.tar.gz | |
drm/nouveau/ttm: prevent double-free in nouveau_sgdma_create_ttm() failure path
TTM calls the destructor on its own already...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_sgdma.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_sgdma.c b/drivers/gpu/drm/nouveau/nouveau_sgdma.c index ca5492a..0843ebc 100644 --- a/drivers/gpu/drm/nouveau/nouveau_sgdma.c +++ b/drivers/gpu/drm/nouveau/nouveau_sgdma.c @@ -104,9 +104,7 @@ nouveau_sgdma_create_ttm(struct ttm_bo_device *bdev, else nvbe->ttm.ttm.func = &nv50_sgdma_backend; - if (ttm_dma_tt_init(&nvbe->ttm, bdev, size, page_flags, dummy_read_page)) { - kfree(nvbe); + if (ttm_dma_tt_init(&nvbe->ttm, bdev, size, page_flags, dummy_read_page)) return NULL; - } return &nvbe->ttm.ttm; } |
