Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e08e96de authored by Arjan van de Ven's avatar Arjan van de Ven Committed by Dave Airlie
Browse files

drm: Make the per-driver file_operations struct const 



From fdf1fdebaa00f81de18c227f32f8074c8b352d50 Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan@linux.intel.com>
Date: Sun, 30 Oct 2011 19:06:07 -0700
Subject: [PATCH] drm: Make the per-driver file_operations struct const

The DRM layer keeps a copy of struct file_operations inside its
big driver struct... which prevents it from being consistent and static.
For consistency (and the general security objective of having such things
static), it's desirable to get this fixed.

This patch splits out the file_operations field to its own struct,
which is then "static const", and just stick a pointer to this into
the driver struct, making it more consistent with how the rest of the
kernel does this.

Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent d68752cf

drivers/gpu/drm/drm_fops.c

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ int drm_stub_open(struct inode *inode, struct file *filp) 
		goto out;



	old_fops = filp->f_op;

	filp->f_op = fops_get(&dev->driver->fops);

	filp->f_op = fops_get(dev->driver->fops);

	if (filp->f_op == NULL) {

		filp->f_op = old_fops;

		goto out;

drivers/gpu/drm/i810/i810_drv.c

+12 −11
Original line number Diff line number Diff line
@@ -43,6 +43,17 @@ static struct pci_device_id pciidlist[] = { 
	i810_PCI_IDS

};



static const struct file_operations i810_driver_fops = {

	.owner = THIS_MODULE,

	.open = drm_open,

	.release = drm_release,

	.unlocked_ioctl = drm_ioctl,

	.mmap = drm_mmap,

	.poll = drm_poll,

	.fasync = drm_fasync,

	.llseek = noop_llseek,

};



static struct drm_driver driver = {

	.driver_features =

	    DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | DRIVER_USE_MTRR |
@@ -55,17 +66,7 @@ static struct drm_driver driver = { 
	.reclaim_buffers_locked = i810_driver_reclaim_buffers_locked,

	.dma_quiescent = i810_driver_dma_quiescent,

	.ioctls = i810_ioctls,

	.fops = {

		 .owner = THIS_MODULE,

		 .open = drm_open,

		 .release = drm_release,

		 .unlocked_ioctl = drm_ioctl,

		 .mmap = drm_mmap,

		 .poll = drm_poll,

		 .fasync = drm_fasync,

		 .llseek = noop_llseek,

	},



	.fops = &i810_driver_fops,

	.name = DRIVER_NAME,

	.desc = DRIVER_DESC,

	.date = DRIVER_DATE,

drivers/gpu/drm/i915/i915_drv.c

+16 −15
Original line number Diff line number Diff line
@@ -788,6 +788,21 @@ static struct vm_operations_struct i915_gem_vm_ops = { 
	.close = drm_gem_vm_close,

};



static const struct file_operations i915_driver_fops = {

	.owner = THIS_MODULE,

	.open = drm_open,

	.release = drm_release,

	.unlocked_ioctl = drm_ioctl,

	.mmap = drm_gem_mmap,

	.poll = drm_poll,

	.fasync = drm_fasync,

	.read = drm_read,

#ifdef CONFIG_COMPAT

	.compat_ioctl = i915_compat_ioctl,

#endif

	.llseek = noop_llseek,

};



static struct drm_driver driver = {

	/* don't use mtrr's here, the Xserver or user space app should

	 * deal with them for intel hardware.
@@ -821,21 +836,7 @@ static struct drm_driver driver = { 
	.dumb_map_offset = i915_gem_mmap_gtt,

	.dumb_destroy = i915_gem_dumb_destroy,

	.ioctls = i915_ioctls,

	.fops = {

		 .owner = THIS_MODULE,

		 .open = drm_open,

		 .release = drm_release,

		 .unlocked_ioctl = drm_ioctl,

		 .mmap = drm_gem_mmap,

		 .poll = drm_poll,

		 .fasync = drm_fasync,

		 .read = drm_read,

#ifdef CONFIG_COMPAT

		 .compat_ioctl = i915_compat_ioctl,

#endif

		 .llseek = noop_llseek,

	},



	.fops = &i915_driver_fops,

	.name = DRIVER_NAME,

	.desc = DRIVER_DESC,

	.date = DRIVER_DATE,

drivers/gpu/drm/mga/mga_drv.c

+15 −14
Original line number Diff line number Diff line
@@ -44,6 +44,20 @@ static struct pci_device_id pciidlist[] = { 
	mga_PCI_IDS

};



static const struct file_operations mga_driver_fops = {

	.owner = THIS_MODULE,

	.open = drm_open,

	.release = drm_release,

	.unlocked_ioctl = drm_ioctl,

	.mmap = drm_mmap,

	.poll = drm_poll,

	.fasync = drm_fasync,

#ifdef CONFIG_COMPAT

	.compat_ioctl = mga_compat_ioctl,

#endif

	.llseek = noop_llseek,

};



static struct drm_driver driver = {

	.driver_features =

	    DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA |
@@ -64,20 +78,7 @@ static struct drm_driver driver = { 
	.reclaim_buffers = drm_core_reclaim_buffers,

	.ioctls = mga_ioctls,

	.dma_ioctl = mga_dma_buffers,

	.fops = {

		.owner = THIS_MODULE,

		.open = drm_open,

		.release = drm_release,

		.unlocked_ioctl = drm_ioctl,

		.mmap = drm_mmap,

		.poll = drm_poll,

		.fasync = drm_fasync,

#ifdef CONFIG_COMPAT

		.compat_ioctl = mga_compat_ioctl,

#endif

		.llseek = noop_llseek,

	},



	.fops = &mga_driver_fops,

	.name = DRIVER_NAME,

	.desc = DRIVER_DESC,

	.date = DRIVER_DATE,

drivers/gpu/drm/nouveau/nouveau_drv.c

+16 −15
Original line number Diff line number Diff line
@@ -388,6 +388,21 @@ nouveau_pci_resume(struct pci_dev *pdev) 
	return 0;

}



static const struct file_operations nouveau_driver_fops = {

	.owner = THIS_MODULE,

	.open = drm_open,

	.release = drm_release,

	.unlocked_ioctl = drm_ioctl,

	.mmap = nouveau_ttm_mmap,

	.poll = drm_poll,

	.fasync = drm_fasync,

	.read = drm_read,

#if defined(CONFIG_COMPAT)

	.compat_ioctl = nouveau_compat_ioctl,

#endif

	.llseek = noop_llseek,

};



static struct drm_driver driver = {

	.driver_features =

		DRIVER_USE_AGP | DRIVER_PCI_DMA | DRIVER_SG |
@@ -413,21 +428,7 @@ static struct drm_driver driver = { 
	.disable_vblank = nouveau_vblank_disable,

	.reclaim_buffers = drm_core_reclaim_buffers,

	.ioctls = nouveau_ioctls,

	.fops = {

		.owner = THIS_MODULE,

		.open = drm_open,

		.release = drm_release,

		.unlocked_ioctl = drm_ioctl,

		.mmap = nouveau_ttm_mmap,

		.poll = drm_poll,

		.fasync = drm_fasync,

		.read = drm_read,

#if defined(CONFIG_COMPAT)

		.compat_ioctl = nouveau_compat_ioctl,

#endif

		.llseek = noop_llseek,

	},



	.fops = &nouveau_driver_fops,

	.gem_init_object = nouveau_gem_object_new,

	.gem_free_object = nouveau_gem_object_del,

	.gem_open_object = nouveau_gem_object_open,