Don't try to use dev->dma_lock unless dma is initialized (dev->dma != NULL)

    in bufs_info sysctl handler. dev->dma and dev->dma_lock existence are
    protected by DRM_LOCK(). Fixes panic on sysctl hw.dri when the device
    is uninitialied (when you aren't in X).

diff --git a/bsd-core/drm_sysctl.c b/bsd-core/drm_sysctl.c
index 905f4c2..4bb603f 100644 (file)
--- a/bsd-core/drm_sysctl.c
+++ b/bsd-core/drm_sysctl.c
@@ -224,12 +224,11 @@ static int DRM(bufs_info) DRM_SYSCTL_HANDLER_ARGS
         * copy of the whole structure and the relevant data from buflist.
         */
        DRM_LOCK();
-       DRM_SPINLOCK(&dev->dma_lock);
        if (dma == NULL) {
-               DRM_SPINUNLOCK(&dev->dma_lock);
                DRM_UNLOCK();
                return 0;
        }
+       DRM_SPINLOCK(&dev->dma_lock);
        tempdma = *dma;
        templists = DRM(alloc)(sizeof(int) * dma->buf_count, DRM_MEM_BUFS);
        for (i = 0; i < dma->buf_count; i++)

diff --git a/bsd/drm_sysctl.h b/bsd/drm_sysctl.h
index 905f4c2..4bb603f 100644 (file)
--- a/bsd/drm_sysctl.h
+++ b/bsd/drm_sysctl.h
@@ -224,12 +224,11 @@ static int DRM(bufs_info) DRM_SYSCTL_HANDLER_ARGS
         * copy of the whole structure and the relevant data from buflist.
         */
        DRM_LOCK();
-       DRM_SPINLOCK(&dev->dma_lock);
        if (dma == NULL) {
-               DRM_SPINUNLOCK(&dev->dma_lock);
                DRM_UNLOCK();
                return 0;
        }
+       DRM_SPINLOCK(&dev->dma_lock);
        tempdma = *dma;
        templists = DRM(alloc)(sizeof(int) * dma->buf_count, DRM_MEM_BUFS);
        for (i = 0; i < dma->buf_count; i++)