summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2016-06-02 12:42:32 +1000
committerBen Skeggs <bskeggs@redhat.com>2016-06-02 13:49:37 +1000
commit0387e59b900318e778b2cc25fbeba9ccb54b7aaf (patch)
treea6f1ae5b09b6c551ed89b907153259f42b16ea0e
parentb96caf74b97f2bcdf80bb36e17a53e5989128caf (diff)
downloadnouveau-0387e59b900318e778b2cc25fbeba9ccb54b7aaf.tar.gz
core: swap the order of imem/fb
Fixes a use-after-free reported by valgrind and KASAN. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drm/nouveau/include/nvkm/core/device.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drm/nouveau/include/nvkm/core/device.h b/drm/nouveau/include/nvkm/core/device.h
index c612dc1f1..126a85cc8 100644
--- a/drm/nouveau/include/nvkm/core/device.h
+++ b/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,