drm/nouveau: avoid a use-after-free when BO init fails
Subsystems (3)
PATCH 1/1 drm/nouveau: avoid a use-after-free when BO init fails
nouveau_bo_init() is backed by ttm_bo_init() and ferries its return code back to the caller. On failures, ttm_bo_init() invokes the provided destructor which should de-initialize and free the memory.
Thus, when nouveau_bo_init() returns an error the gem object has already been released and the memory freed by nouveau_bo_del_ttm().
--- drivers/gpu/drm/nouveau/nouveau_gem.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/nouveau/nouveau_gem.c +1 -3
@@ -211,10 +211,8 @@ nouveau_gem_new(struct nouveau_cli *cli, u64 size, int align, uint32_t domain, } ret =nouveau_bo_init (nvbo, size, align, domain,NULL ,NULL ); -if (ret) { -nouveau_bo_ref (NULL , &nvbo); +if (ret)return ret; - }/* we restrict allowed domains on nv50+ to only the types * that were requested at creation time. not possibly on
Signature · 1 line
2.28.0
Quoted 32 lines · Jeremy Cline
nouveau_bo_init()is backed byttm_bo_init()and ferries its return code back to the caller. On failures,ttm_bo_init()invokes the provided destructor which should de-initialize and free the memory.Thus, when
nouveau_bo_init()returns an error the gem object has already been released and the memory freed bynouveau_bo_del_ttm().Fixes 019cbd4a4feb ("drm/nouveau: Initialize GEM object before TTM object")Cc Thierry Reding <[email protected]>Signed-off-by Jeremy Cline <[email protected]>---
drivers/gpu/drm/nouveau/nouveau_gem.c | 4 +---1 file changed, 1 insertion(+), 3 deletions(-)drivers/gpu/drm/nouveau/nouveau_gem.c +0
-0@@ -211,10 +211,8 @@ nouveau_gem_new(struct nouveau_cli *cli, u64 size, int align, uint32_t domain, }
ret =nouveau_bo_init(nvbo, size, align, domain, NULL, NULL); - if (ret) {
- nouveau_bo_ref(NULL, &nvbo);
+ if (ret)
return ret;
- }
/* we restrict allowed domains on nv50+ to only the types
* that were requested at creation time. not possibly on
Signature · 13 lines
Sincerely, Lyude Paul (she/her) Software Engineer at Red Hat Note: I deal with a lot of emails and have a lot of bugs on my plate. If you've asked me a question, are waiting for a review/merge on a patch, etc. and I haven't responded in a while, please feel free to send me another email to check on my status. I don't bite! _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Karol Herbst
Reviewed-byand queued
Quoted 51 lines · Lyude Paul
Reviewed-by Lyude Paul <[email protected]>Quoted 31 lines · Jeremy Cline
nouveau_bo_init()is backed byttm_bo_init()and ferries its return code back to the caller. On failures,ttm_bo_init()invokes the provided destructor which should de-initialize and free the memory.Thus, when
nouveau_bo_init()returns an error the gem object has already been released and the memory freed bynouveau_bo_del_ttm().Fixes 019cbd4a4feb ("drm/nouveau: Initialize GEM object before TTM object")Cc Thierry Reding <[email protected]>Signed-off-by Jeremy Cline <[email protected]>--- drivers/gpu/drm/nouveau/nouveau_gem.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)drivers/gpu/drm/nouveau/nouveau_gem.c +1
-3@@ -211,10 +211,8 @@ nouveau_gem_new(struct nouveau_cli *cli, u64 size, int align, uint32_t domain, } ret =nouveau_bo_init (nvbo, size, align, domain,NULL ,NULL ); -if (ret) { -nouveau_bo_ref (NULL , &nvbo); +if (ret)return ret; - }/* we restrict allowed domains on nv50+ to only the types Quoted 1 line
* that were requested at creation time. not possibly on
--
Sincerely,
Lyude Paul (she/her)
Software Engineer at Red HatNote: I deal with a lot of emails and have a lot of bugs on my plate. If you've asked me a question, are waiting for a review/merge on a patch, etc. and I haven't responded in a while, please feel free to send me another email to check on my status. I don't bite!
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel