Commit 407e9ef7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

compat_ioctl: move drivers to compat_ptr_ioctl 



Each of these drivers has a copy of the same trivial helper function to
convert the pointer argument and then call the native ioctl handler.

We now have a generic implementation of that, so use it.

Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Acked-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Reviewed-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@mellanox.com>
Reviewed-by: default avatarJiri Kosina <jkosina@suse.cz>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 076ff658

drivers/char/ppdev.c

+1 −11
Original line number Diff line number Diff line
@@ -670,14 +670,6 @@ static long pp_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	return ret;

}



#ifdef CONFIG_COMPAT

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

			    unsigned long arg)

{

	return pp_ioctl(file, cmd, (unsigned long)compat_ptr(arg));

}

#endif



static int pp_open(struct inode *inode, struct file *file)

{

	unsigned int minor = iminor(inode);
@@ -786,9 +778,7 @@ static const struct file_operations pp_fops = { 
	.write		= pp_write,

	.poll		= pp_poll,

	.unlocked_ioctl	= pp_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl   = pp_compat_ioctl,

#endif

	.compat_ioctl   = compat_ptr_ioctl,

	.open		= pp_open,

	.release	= pp_release,

};

drivers/char/tpm/tpm_vtpm_proxy.c

+1 −11
Original line number Diff line number Diff line
@@ -670,20 +670,10 @@ static long vtpmx_fops_ioctl(struct file *f, unsigned int ioctl, 
	}

}



#ifdef CONFIG_COMPAT

static long vtpmx_fops_compat_ioctl(struct file *f, unsigned int ioctl,

					  unsigned long arg)

{

	return vtpmx_fops_ioctl(f, ioctl, (unsigned long)compat_ptr(arg));

}

#endif



static const struct file_operations vtpmx_fops = {

	.owner = THIS_MODULE,

	.unlocked_ioctl = vtpmx_fops_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl = vtpmx_fops_compat_ioctl,

#endif

	.compat_ioctl = compat_ptr_ioctl,

	.llseek = noop_llseek,

};

drivers/firewire/core-cdev.c

+1 −11
Original line number Diff line number Diff line
@@ -1646,14 +1646,6 @@ static long fw_device_op_ioctl(struct file *file, 
	return dispatch_ioctl(file->private_data, cmd, (void __user *)arg);

}



#ifdef CONFIG_COMPAT

static long fw_device_op_compat_ioctl(struct file *file,

				      unsigned int cmd, unsigned long arg)

{

	return dispatch_ioctl(file->private_data, cmd, compat_ptr(arg));

}

#endif



static int fw_device_op_mmap(struct file *file, struct vm_area_struct *vma)

{

	struct client *client = file->private_data;
@@ -1795,7 +1787,5 @@ const struct file_operations fw_device_ops = { 
	.mmap		= fw_device_op_mmap,

	.release	= fw_device_op_release,

	.poll		= fw_device_op_poll,

#ifdef CONFIG_COMPAT

	.compat_ioctl	= fw_device_op_compat_ioctl,

#endif

	.compat_ioctl	= compat_ptr_ioctl,

};

drivers/hid/usbhid/hiddev.c

+1 −10
Original line number Diff line number Diff line
@@ -854,13 +854,6 @@ ret_unlock: 
	return r;

}



#ifdef CONFIG_COMPAT

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

{

	return hiddev_ioctl(file, cmd, (unsigned long)compat_ptr(arg));

}

#endif



static const struct file_operations hiddev_fops = {

	.owner =	THIS_MODULE,

	.read =		hiddev_read,
@@ -870,9 +863,7 @@ static const struct file_operations hiddev_fops = { 
	.release =	hiddev_release,

	.unlocked_ioctl =	hiddev_ioctl,

	.fasync =	hiddev_fasync,

#ifdef CONFIG_COMPAT

	.compat_ioctl	= hiddev_compat_ioctl,

#endif

	.compat_ioctl	= compat_ptr_ioctl,

	.llseek		= noop_llseek,

};

drivers/hwtracing/stm/core.c

+1 −11
Original line number Diff line number Diff line
@@ -832,23 +832,13 @@ stm_char_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	return err;

}



#ifdef CONFIG_COMPAT

static long

stm_char_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)

{

	return stm_char_ioctl(file, cmd, (unsigned long)compat_ptr(arg));

}

#else

#define stm_char_compat_ioctl	NULL

#endif



static const struct file_operations stm_fops = {

	.open		= stm_char_open,

	.release	= stm_char_release,

	.write		= stm_char_write,

	.mmap		= stm_char_mmap,

	.unlocked_ioctl	= stm_char_ioctl,

	.compat_ioctl	= stm_char_compat_ioctl,

	.compat_ioctl	= compat_ptr_ioctl,

	.llseek		= no_llseek,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE