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

Commit add77184 authored by Mathieu Segaud's avatar Mathieu Segaud Committed by Greg Kroah-Hartman
Browse files

PCI: Convert drivers/pci/proc.c to use unlocked_ioctl 



Change access to inode thru file->f_dentry->d_inode, and add explicit
lock/unlock_kernel() calls.


Signed-off-by: default avatarMathieu Segaud <mathieu.segaud@regala.cx>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2326e2b9

drivers/pci/proc.c

+8 −3
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/module.h>

#include <linux/proc_fs.h>

#include <linux/seq_file.h>

#include <linux/smp_lock.h>

#include <linux/capability.h>

#include <asm/uaccess.h>

#include <asm/byteorder.h>
@@ -202,15 +203,18 @@ struct pci_filp_private { 
	int write_combine;

};



static int proc_bus_pci_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)

static long proc_bus_pci_ioctl(struct file *file, unsigned int cmd,

			       unsigned long arg)

{

	const struct proc_dir_entry *dp = PDE(inode);

	const struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);

	struct pci_dev *dev = dp->data;

#ifdef HAVE_PCI_MMAP

	struct pci_filp_private *fpriv = file->private_data;

#endif /* HAVE_PCI_MMAP */

	int ret = 0;



	lock_kernel();



	switch (cmd) {

	case PCIIOC_CONTROLLER:

		ret = pci_domain_nr(dev->bus);
@@ -239,6 +243,7 @@ static int proc_bus_pci_ioctl(struct inode *inode, struct file *file, unsigned i 
		break;

	};



	unlock_kernel();

	return ret;

}
@@ -291,7 +296,7 @@ static const struct file_operations proc_bus_pci_operations = { 
	.llseek		= proc_bus_pci_lseek,

	.read		= proc_bus_pci_read,

	.write		= proc_bus_pci_write,

	.ioctl		= proc_bus_pci_ioctl,

	.unlocked_ioctl	= proc_bus_pci_ioctl,

#ifdef HAVE_PCI_MMAP

	.open		= proc_bus_pci_open,

	.release	= proc_bus_pci_release,