geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nouveau: fix crash in pushbuf_dump with an unmapped bo 

Signed-off-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
main
Karol Herbst 2020-05-03 16:19:53 +02:00
parent bf08984682
commit 52fd2a2542
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nouveau/pushbuf.c
View File

@ -294,9 +294,12 @@ pushbuf_dump(struct nouveau_pushbuf_krec *krec, int krec_id, int chid)
bgn = (uint32_t *)((char *)bo->map + kpsh->offset); bgn = (uint32_t *)((char *)bo->map + kpsh->offset);
end = bgn + (kpsh->length /4); end = bgn + (kpsh->length /4);
err("ch%d: psh %08x %010llx %010llx\n", chid, kpsh->bo_index, err("ch%d: psh %s%08x %010llx %010llx\n", chid,
bo->map ? "" : "(unmapped) ", kpsh->bo_index,
(unsigned long long)kpsh->offset, (unsigned long long)kpsh->offset,
(unsigned long long)(kpsh->offset + kpsh->length)); (unsigned long long)(kpsh->offset + kpsh->length));
if (!bo->map)
continue;
while (bgn < end) while (bgn < end)
err("\t0x%08x\n", *bgn++); err("\t0x%08x\n", *bgn++);
} }