diff options
| author | Karol Herbst <kherbst@redhat.com> | 2020-10-07 00:08:09 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-10 12:39:07 +0100 |
| commit | b74c934d47a6b2a868a519c37d19dfcd9ea0bfd5 (patch) | |
| tree | 9e08a0ab5344d11b6c93428d8637b6ef04b7decd | |
| parent | 009296595df7cdb41845feceae449e549759d4e0 (diff) | |
| download | linux-b74c934d47a6b2a868a519c37d19dfcd9ea0bfd5.tar.gz linux-b74c934d47a6b2a868a519c37d19dfcd9ea0bfd5.tar.bz2 linux-b74c934d47a6b2a868a519c37d19dfcd9ea0bfd5.zip | |
drm/nouveau/gem: fix "refcount_t: underflow; use-after-free"
[ Upstream commit 925681454d7b557d404b5d28ef4469fac1b2e105 ]
we can't use nouveau_bo_ref here as no ttm object was allocated and
nouveau_bo_ref mainly deals with that. Simply deallocate the object.
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_gem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c index 81f111ad3f4f..124d3dcc5c59 100644 --- a/drivers/gpu/drm/nouveau/nouveau_gem.c +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c @@ -198,7 +198,8 @@ nouveau_gem_new(struct nouveau_cli *cli, u64 size, int align, uint32_t domain, * to the caller, instead of a normal nouveau_bo ttm reference. */ ret = drm_gem_object_init(drm->dev, &nvbo->bo.base, size); if (ret) { - nouveau_bo_ref(NULL, &nvbo); + drm_gem_object_release(&nvbo->bo.base); + kfree(nvbo); return ret; } |