From: Ben Skeggs Date: Thu, 2 Jun 2016 02:42:32 +0000 (+1000) Subject: drm/nouveau/core: swap the order of imem/fb X-Git-Tag: v4.9.8~1790^2~1^2~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=77154fd969df749f5bf83f639af19fca199de033;p=platform%2Fkernel%2Flinux-rpi3.git drm/nouveau/core: swap the order of imem/fb Fixes a use-after-free reported by valgrind and KASAN. Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/device.h b/drivers/gpu/drm/nouveau/include/nvkm/core/device.h index c612dc1..126a85c 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/device.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/device.h @@ -16,9 +16,9 @@ enum nvkm_devidx { NVKM_SUBDEV_MC, NVKM_SUBDEV_BUS, NVKM_SUBDEV_TIMER, + NVKM_SUBDEV_INSTMEM, NVKM_SUBDEV_FB, NVKM_SUBDEV_LTC, - NVKM_SUBDEV_INSTMEM, NVKM_SUBDEV_MMU, NVKM_SUBDEV_BAR, NVKM_SUBDEV_PMU,