Re: [PATCH] posix-clock: drop code duplication using compat_ptr_ioctl

From: Cyrill Gorcunov
Date: Mon Jan 20 2025 - 17:31:01 EST


On Mon, Jan 20, 2025 at 11:22:52PM +0100, Thomas Weißschuh wrote:
...
> > -#ifdef CONFIG_COMPAT
> > - .compat_ioctl = posix_clock_compat_ioctl,
> > -#endif
> > + .compat_ioctl = compat_ptr_ioctl,
>
> This is not correct on s390. (It wasn't before either, though)
> The improved patch below is in my personal queue, but I didn't get
> around to actually testing and submitting it yet.

Hi, Thomas! Thanks for looking into the patch! I somehow miss why it won't
work 'cause compat_ptr_ioctl already does the same conversion as in your
code below, no? I miss something obvious?

```
long compat_ptr_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
if (!file->f_op->unlocked_ioctl)
return -ENOIOCTLCMD;

return file->f_op->unlocked_ioctl(file, cmd, (unsigned long)compat_ptr(arg));
}
EXPORT_SYMBOL(compat_ptr_ioctl);
```

> +#ifdef CONFIG_COMPAT
> +long ptp_compat_ioctl(struct posix_clock_context *pccontext, unsigned int cmd,
> + unsigned long arg)
> +{
> + switch (cmd) {
> + case PTP_ENABLE_PPS:
> + case PTP_ENABLE_PPS2:
> + /* These take in scalar arg, do not convert */
> + break;
> + default:
> + arg = (unsigned long)compat_ptr(arg);

Here^^^

> + }
> +
> + return ptp_ioctl(pccontext, cmd, arg);
> +}
> +#endif