drm: Use a const drm_driver for legacy PCI devices

Now that the legacy PCI support code doesn't need to write to the
drm_driver structure, it can be treated as const through the whole DRM
core, unconditionally. This allows declaring the structure as const in
all drivers, removing one possible attack vector.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 734303802bc3989ac7f3b88f7111d74bf7c72881..3f57e880685e5a00dd24173cd468ac2988f77ce2 100644 (file)
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -589,11 +589,7 @@ static int drm_dev_init(struct drm_device *dev,
 
        kref_init(&dev->ref);
        dev->dev = get_device(parent);
-#ifdef CONFIG_DRM_LEGACY
-       dev->driver = (struct drm_driver *)driver;
-#else
        dev->driver = driver;
-#endif
 
        INIT_LIST_HEAD(&dev->managed.resources);
        spin_lock_init(&dev->managed.lock);

diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
index dfb138aaccba9425a3efaa41a7ac0ee45f9b3b2f..5370e6b492fd814a639e61666b500b2b21847cf8 100644 (file)
--- a/drivers/gpu/drm/drm_pci.c
+++ b/drivers/gpu/drm/drm_pci.c
@@ -201,7 +201,7 @@ static void drm_pci_agp_init(struct drm_device *dev)
 
 static int drm_get_pci_dev(struct pci_dev *pdev,
                           const struct pci_device_id *ent,
-                          struct drm_driver *driver)
+                          const struct drm_driver *driver)
 {
        struct drm_device *dev;
        int ret;
@@ -255,7 +255,8 @@ err_free:
  *
  * Return: 0 on success or a negative error code on failure.
  */
-int drm_legacy_pci_init(struct drm_driver *driver, struct pci_driver *pdriver)
+int drm_legacy_pci_init(const struct drm_driver *driver,
+                       struct pci_driver *pdriver)
 {
        struct pci_dev *pdev = NULL;
        const struct pci_device_id *pid;
@@ -300,7 +301,8 @@ EXPORT_SYMBOL(drm_legacy_pci_init);
  * Unregister a DRM driver shadow-attached through drm_legacy_pci_init(). This
  * is deprecated and only used by dri1 drivers.
  */
-void drm_legacy_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver)
+void drm_legacy_pci_exit(const struct drm_driver *driver,
+                        struct pci_driver *pdriver)
 {
        struct drm_device *dev, *tmp;
 

diff --git a/include/drm/drm_device.h b/include/drm/drm_device.h
index bd5abe7cd48f67719c885e8b6d038bfb4cebaccc..939904ae88fc3d8765fea638b430ec32782a0b28 100644 (file)
--- a/include/drm/drm_device.h
+++ b/include/drm/drm_device.h
@@ -76,11 +76,7 @@ struct drm_device {
        } managed;
 
        /** @driver: DRM driver managing the device */
-#ifdef CONFIG_DRM_LEGACY
-       struct drm_driver *driver;
-#else
        const struct drm_driver *driver;
-#endif
 
        /**
         * @dev_private:

diff --git a/include/drm/drm_legacy.h b/include/drm/drm_legacy.h
index 852d7451eeb12943d9be4f77126d8a043df8f5fe..8ed04e9be997000be0837e4af3514b6abda384a9 100644 (file)
--- a/include/drm/drm_legacy.h
+++ b/include/drm/drm_legacy.h
@@ -198,8 +198,10 @@ struct drm_dma_handle *drm_pci_alloc(struct drm_device *dev, size_t size,
                                     size_t align);
 void drm_pci_free(struct drm_device *dev, struct drm_dma_handle *dmah);
 
-int drm_legacy_pci_init(struct drm_driver *driver, struct pci_driver *pdriver);
-void drm_legacy_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver);
+int drm_legacy_pci_init(const struct drm_driver *driver,
+                       struct pci_driver *pdriver);
+void drm_legacy_pci_exit(const struct drm_driver *driver,
+                        struct pci_driver *pdriver);
 
 #else
 
@@ -214,13 +216,13 @@ static inline void drm_pci_free(struct drm_device *dev,
 {
 }
 
-static inline int drm_legacy_pci_init(struct drm_driver *driver,
+static inline int drm_legacy_pci_init(const struct drm_driver *driver,
                                      struct pci_driver *pdriver)
 {
        return -EINVAL;
 }
 
-static inline void drm_legacy_pci_exit(struct drm_driver *driver,
+static inline void drm_legacy_pci_exit(const struct drm_driver *driver,
                                       struct pci_driver *pdriver)
 {
 }