diff options
| author |   Marcin Slusarz <marcin.slusarz@gmail.com> | 2011-08-22 23:14:05 +0200 |
|---|---|---|
| committer |   Ben Skeggs <bskeggs@redhat.com> | 2011-09-09 17:24:06 +1000 |
| commit | 17c8b960930da3599e47801a54ac0ea1070545d2 (patch) | |
| tree | e0822fc2fb25b39e2b4fc957615a76ce0cdae0ed /drivers/gpu | |
| parent | drm/nouveau: fix oops on pre-semaphore hardware (diff) | |
| download | linux-dev-17c8b960930da3599e47801a54ac0ea1070545d2.tar.xz linux-dev-17c8b960930da3599e47801a54ac0ea1070545d2.zip | |
drm/nouveau: properly handle allocation failure in nouveau_sgdma_populate
Not cleaning after alloc failure would result in crash on destroy,
because nouveau_sgdma_clear assumes "ttm_alloced" to be not null when
"pages" is not null.
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Cc: stable@kernel.org
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_sgdma.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_sgdma.c b/drivers/gpu/drm/nouveau/nouveau_sgdma.c index c444cadbf849..88062de26b00 100644 --- a/drivers/gpu/drm/nouveau/nouveau_sgdma.c +++ b/drivers/gpu/drm/nouveau/nouveau_sgdma.c @@ -37,8 +37,11 @@ nouveau_sgdma_populate(struct ttm_backend *be, unsigned long num_pages, return -ENOMEM; nvbe->ttm_alloced = kmalloc(sizeof(bool) * num_pages, GFP_KERNEL); - if (!nvbe->ttm_alloced) + if (!nvbe->ttm_alloced) { + kfree(nvbe->pages); + nvbe->pages = NULL; return -ENOMEM; + } nvbe->nr_pages = 0; while (num_pages--) { |