[src/trunk]: src/sys/external/bsd/drm2/dist/drm/ttm Fix error branch in ttm_d...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8facea92039a
branches:  trunk
changeset: 355481:8facea92039a
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Jul 30 13:43:48 2017 +0000

description:
Fix error branch in ttm_dma_tt_init to avoid double-free.

Should fix symptom of PR kern/52438, but who knows what underlying
problem causes us to reach the error branch in the first place.

diffstat:

 sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (13 lines):

diff -r 5abee232805d -r 8facea92039a sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c
--- a/sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c       Sun Jul 30 13:12:49 2017 +0000
+++ b/sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c       Sun Jul 30 13:43:48 2017 +0000
@@ -284,7 +284,8 @@
 fail1: kmem_free(ttm_dma->dma_segs, (ttm->num_pages *
                sizeof(ttm_dma->dma_segs[0])));
 fail0: KASSERT(error);
-       ttm_tt_destroy(ttm);
+       drm_free_large(ttm->pages);
+       uao_detach(ttm->swap_storage);
        /* XXX errno NetBSD->Linux */
        return -error;
     }