Commit 1832f2d8 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

compat_ioctl: move more drivers to compat_ptr_ioctl 



The .ioctl and .compat_ioctl file operations have the same prototype so
they can both point to the same function, which works great almost all
the time when all the commands are compatible.

One exception is the s390 architecture, where a compat pointer is only
31 bit wide, and converting it into a 64-bit pointer requires calling
compat_ptr(). Most drivers here will never run in s390, but since we now
have a generic helper for it, it's easy enough to use it consistently.

I double-checked all these drivers to ensure that all ioctl arguments
are used as pointers or are ignored, but are not interpreted as integer
values.

Acked-by: default avatarJason Gunthorpe <jgg@mellanox.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: default avatarDavid Sterba <dsterba@suse.com>
Acked-by: default avatarDarren Hart (VMware) <dvhart@infradead.org>
Acked-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Acked-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Acked-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 407e9ef7

drivers/android/binder.c

+1 −1
Original line number Diff line number Diff line
@@ -6063,7 +6063,7 @@ const struct file_operations binder_fops = { 
	.owner = THIS_MODULE,

	.poll = binder_poll,

	.unlocked_ioctl = binder_ioctl,

	.compat_ioctl = binder_ioctl,

	.compat_ioctl = compat_ptr_ioctl,

	.mmap = binder_mmap,

	.open = binder_open,

	.flush = binder_flush,

drivers/crypto/qat/qat_common/adf_ctl_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static long adf_ctl_ioctl(struct file *fp, unsigned int cmd, unsigned long arg); 
static const struct file_operations adf_ctl_ops = {

	.owner = THIS_MODULE,

	.unlocked_ioctl = adf_ctl_ioctl,

	.compat_ioctl = adf_ctl_ioctl,

	.compat_ioctl = compat_ptr_ioctl,

};



struct adf_ctl_drv_info {

drivers/dma-buf/dma-buf.c

+1 −3
Original line number Diff line number Diff line
@@ -415,9 +415,7 @@ static const struct file_operations dma_buf_fops = { 
	.llseek		= dma_buf_llseek,

	.poll		= dma_buf_poll,

	.unlocked_ioctl	= dma_buf_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl	= dma_buf_ioctl,

#endif

	.compat_ioctl	= compat_ptr_ioctl,

	.show_fdinfo	= dma_buf_show_fdinfo,

};

drivers/dma-buf/sw_sync.c

+1 −1
Original line number Diff line number Diff line
@@ -408,5 +408,5 @@ const struct file_operations sw_sync_debugfs_fops = { 
	.open           = sw_sync_debugfs_open,

	.release        = sw_sync_debugfs_release,

	.unlocked_ioctl = sw_sync_ioctl,

	.compat_ioctl	= sw_sync_ioctl,

	.compat_ioctl	= compat_ptr_ioctl,

};

drivers/dma-buf/sync_file.c

+1 −1
Original line number Diff line number Diff line
@@ -480,5 +480,5 @@ static const struct file_operations sync_file_fops = { 
	.release = sync_file_release,

	.poll = sync_file_poll,

	.unlocked_ioctl = sync_file_ioctl,

	.compat_ioctl = sync_file_ioctl,

	.compat_ioctl = compat_ptr_ioctl,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE