redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

drm/nv50/fb: Fix nullptr-deref on IGPs

Browse source 
When COMP_MAX_TAG == 0, the tags mm was uninitialised. Fixed by initialising with zero length.

v2: Fix style error

Signed-off-by: Roy Spliet <r.spliet@student.tudelft.nl>
Tested-by: Roy Spliet <r.spliet@student.tudelft.nl>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Roy Spliet 2013-01-09 03:40:33 +01:00 committed by Ben Skeggs
parent 1e98380cbd
commit 526810adb9
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/gpu/drm/nouveau/core/subdev/fb/base.c
View file

@ -86,8 +86,8 @@ nouveau_fb_preinit(struct nouveau_fb *pfb)
return ret; return ret;
} }
if (!nouveau_mm_initialised(&pfb->tags) && tags) { if (!nouveau_mm_initialised(&pfb->tags)) {
ret = nouveau_mm_init(&pfb->tags, 0, ++tags, 1); ret = nouveau_mm_init(&pfb->tags, 0, tags ? ++tags : 0, 1);
if (ret) if (ret)
return ret; return ret;
} }

5
drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c
View file

@ -99,7 +99,7 @@ nv50_fb_vram_init(struct nouveau_fb *pfb)
struct nouveau_bios *bios = nouveau_bios(device); struct nouveau_bios *bios = nouveau_bios(device);
const u32 rsvd_head = ( 256 * 1024) >> 12; /* vga memory */ const u32 rsvd_head = ( 256 * 1024) >> 12; /* vga memory */
const u32 rsvd_tail = (1024 * 1024) >> 12; /* vbios etc */ const u32 rsvd_tail = (1024 * 1024) >> 12; /* vbios etc */
u32 size; u32 size, tags = 0;
int ret; int ret;
pfb->ram.size = nv_rd32(pfb, 0x10020c); pfb->ram.size = nv_rd32(pfb, 0x10020c);
@ -140,10 +140,11 @@ nv50_fb_vram_init(struct nouveau_fb *pfb)
return ret; return ret;
pfb->ram.ranks = (nv_rd32(pfb, 0x100200) & 0x4) ? 2 : 1; pfb->ram.ranks = (nv_rd32(pfb, 0x100200) & 0x4) ? 2 : 1;
tags = nv_rd32(pfb, 0x100320);
break; break;
} }
return nv_rd32(pfb, 0x100320); return tags;
} }
static int static int