mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-07 03:18:31 +00:00
Code Issues Releases Wiki Activity

Merge branch 'linux-3.17' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes

Browse source 
single fix for nouveau.

* 'linux-3.17' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau/core: don't leak oclass type bits to user
This commit is contained in:
Dave Airlie 2014-09-05 09:27:33 +10:00
commit 68c78bd67b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/gpu/drm/nouveau/core/core/parent.c
View file

@ -86,7 +86,7 @@ nouveau_parent_lclass(struct nouveau_object *parent, u32 *lclass, int size)
sclass = nv_parent(parent)->sclass; sclass = nv_parent(parent)->sclass;
while (sclass) { while (sclass) {
if (++nr < size) if (++nr < size)
lclass[nr] = sclass->oclass->handle; lclass[nr] = sclass->oclass->handle & 0xffff;
sclass = sclass->sclass; sclass = sclass->sclass;
} }
@ -96,7 +96,7 @@ nouveau_parent_lclass(struct nouveau_object *parent, u32 *lclass, int size)
if (engine && (oclass = engine->sclass)) { if (engine && (oclass = engine->sclass)) {
while (oclass->ofuncs) { while (oclass->ofuncs) {
if (++nr < size) if (++nr < size)
lclass[nr] = oclass->handle; lclass[nr] = oclass->handle & 0xffff;
oclass++; oclass++;
} }
} }