Re: [PATCH] UBI: add ioctl compatibility

Arnd Bergmann
2009-01-15T16:34:40Z

On Thursday 15 January 2009, Artem Bityutskiy wrote:

> would you please glance if this patch all-right?

No, it's not. New ioctl numbers should not be added to fs/compat_ioctl.c
but rather to the file that implements the file operations (ubi/cdev.c).

The best way to do it would be to add functions that do

static long compat_vol_cdev_ioctl(struct file *file,
unsigned int cmd, unsigned long arg)
{
int ret;

arg = (unsigned long)compat_ptr(arg);

lock_kernel();
ret = vol_cdev_locked_ioctl(file->f_inode, file, cmd, arg);
unlock_kernel();

return ret;
}

static long vol_cdev_ioctl(struct file *file,
unsigned int cmd, unsigned long arg)
{
int ret;

lock_kernel();
ret = vol_cdev_locked_ioctl(file->f_inode, file, cmd, arg);
unlock_kernel();

return ret;
}

and then use these two functions as your unlocked_ioctl and compat_ioctl
methods in file_operations.

If you can prove that you don't rely on the BKL, you can also drop the
{un,}lock_kernel() calls.

> COMPATIBLE_IOCTL(MEMGETREGIONINFO)
> COMPATIBLE_IOCTL(MEMGETBADBLOCK)
> COMPATIBLE_IOCTL(MEMSETBADBLOCK)
> +/* UBI */
> +COMPATIBLE_IOCTL(UBI_IOCMKVOL)
> +ULONG_IOCTL(UBI_IOCRMVOL)
> +COMPATIBLE_IOCTL(UBI_IOCRSVOL)
> +COMPATIBLE_IOCTL(UBI_IOCRNVOL)
> +COMPATIBLE_IOCTL(UBI_IOCATT)
> +ULONG_IOCTL(UBI_IOCDET)
> +ULONG_IOCTL(UBI_IOCVOLUP)
> +ULONG_IOCTL(UBI_IOCEBER)
> +ULONG_IOCTL(UBI_IOCEBCH)
> +ULONG_IOCTL(UBI_IOCEBMAP)
> +ULONG_IOCTL(UBI_IOCEBUNMAP)
> +ULONG_IOCTL(UBI_IOCEBISMAP)

ULONG_IOCTL() would be wrong here, all your ioctl handlers expect
a pointer, not an unsigned long