]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/nouveau: fix a use-after-free in nouveau_gem_prime_import_sg_table()
authorJianglei Nie <niejianglei2021@163.com>
Tue, 5 Jul 2022 13:25:46 +0000 (21:25 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 26 Oct 2022 11:22:21 +0000 (13:22 +0200)
commit a6f592a89ad4dd5b70d7a686970c3cb2719d7f3a upstream.

nouveau_bo_init() is backed by ttm_bo_init() and ferries its return code
back to the caller. On failures, ttm will call nouveau_bo_del_ttm() and
free the memory.Thus, when nouveau_bo_init() returns an error, the gem
object has already been released. Then the call to nouveau_bo_ref() will
use the freed "nvbo->bo" and lead to a use-after-free bug.

We should delete the call to nouveau_bo_ref() to avoid the use-after-free.

Signed-off-by: Jianglei Nie <niejianglei2021@163.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Signed-off-by: Lyude Paul <lyude@redhat.com>
Fixes: a65fdc4451ac ("drm/nouveau: Initialize GEM object before TTM object")
Cc: Thierry Reding <treding@nvidia.com>
Cc: <stable@vger.kernel.org> # v5.4+
Link: https://patchwork.freedesktop.org/patch/msgid/20220705132546.2247677-1-niejianglei2021@163.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/nouveau/nouveau_prime.c

index f9ee562f72d330b306ffdcbfe396d861aac57ecd..25cbe4ef383bd3629189ba9d679da87e3e41611e 100644 (file)
@@ -90,7 +90,6 @@ struct drm_gem_object *nouveau_gem_prime_import_sg_table(struct drm_device *dev,
 
        ret = nouveau_bo_init(nvbo, size, align, flags, sg, robj);
        if (ret) {
-               nouveau_bo_ref(NULL, &nvbo);
                obj = ERR_PTR(ret);
                goto unlock;
        }