mirror of
https://github.com/torvalds/linux
synced 2024-09-22 20:37:18 +00:00
Merge branch 'linux-3.17' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
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:
commit
68c78bd67b
|
@ -86,7 +86,7 @@ nouveau_parent_lclass(struct nouveau_object *parent, u32 *lclass, int size)
|
|||
sclass = nv_parent(parent)->sclass;
|
||||
while (sclass) {
|
||||
if (++nr < size)
|
||||
lclass[nr] = sclass->oclass->handle;
|
||||
lclass[nr] = sclass->oclass->handle & 0xffff;
|
||||
sclass = sclass->sclass;
|
||||
}
|
||||
|
||||
|
@ -96,7 +96,7 @@ nouveau_parent_lclass(struct nouveau_object *parent, u32 *lclass, int size)
|
|||
if (engine && (oclass = engine->sclass)) {
|
||||
while (oclass->ofuncs) {
|
||||
if (++nr < size)
|
||||
lclass[nr] = oclass->handle;
|
||||
lclass[nr] = oclass->handle & 0xffff;
|
||||
oclass++;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue