diff options
author | Konsta Holtta <kholtta@nvidia.com> | 2016-09-05 07:58:16 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2016-09-14 17:13:55 -0400 |
commit | b700d3a0408fff6920cae9b8a3f434530586eb70 (patch) | |
tree | 65e448d8001772c30124d5c26761d861629cef4f /drivers/gpu/nvgpu | |
parent | 6029684eb0e9d2def2b0c12cbfba90c24b99369f (diff) |
gpu: nvgpu: fix null access in page table allocation
Check entry->mem.sgt for validity before attempting to dereference it in
a debug print.
Bug 1809939
Change-Id: If7aa7444c162a076d8f23a88dfd2e3e0a9c33813
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: http://git-master/r/1215522
(cherry picked from commit 48c25cd4f1db9d5bb07847af4de29d8f369b52e3)
Reviewed-on: http://git-master/r/1220547
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c index d66e46b8..bf4a8f57 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c | |||
@@ -1292,7 +1292,10 @@ static int gk20a_zalloc_gmmu_page_table(struct vm_gk20a *vm, | |||
1292 | 1292 | ||
1293 | err = alloc_gmmu_pages(vm, order, entry); | 1293 | err = alloc_gmmu_pages(vm, order, entry); |
1294 | gk20a_dbg(gpu_dbg_pte, "entry = 0x%p, addr=%08llx, size %d", | 1294 | gk20a_dbg(gpu_dbg_pte, "entry = 0x%p, addr=%08llx, size %d", |
1295 | entry, g->ops.mm.get_iova_addr(g, entry->mem.sgt->sgl, 0), | 1295 | entry, |
1296 | entry->mem.sgt ? | ||
1297 | g->ops.mm.get_iova_addr(g, entry->mem.sgt->sgl, 0) | ||
1298 | : 0, | ||
1296 | order); | 1299 | order); |
1297 | if (err) | 1300 | if (err) |
1298 | return err; | 1301 | return err; |