RE: [PATCH] media: atomisp: remove compat_ioctl32 code
From: David Laight
Date: Mon May 17 2021 - 09:04:40 EST
From: Andy Shevchenko
> Sent: 17 May 2021 08:10
>
> On Mon, May 17, 2021 at 3:27 AM Arnd Bergmann <arnd@xxxxxxxxxx> wrote:
> >
> > From: Arnd Bergmann <arnd@xxxxxxxx>
> >
> > This is one of the last remaining users of compat_alloc_user_space()
> > and copy_in_user(), which are in the process of getting removed.
> >
> > As of commit 57e6b6f2303e ("media: atomisp_fops.c: disable
> > atomisp_compat_ioctl32"), nothing in this file is actually getting used
> > as the only reference has been stubbed out.
> >
> > Remove the entire file -- anyone willing to restore the functionality
> > can equally well just look up the contents in the git history if needed.
>
> Everything which removes tons of LOCs in this driver I like by default, thanks!
....
> > diff --git a/drivers/staging/media/atomisp/pci/atomisp_fops.c
> b/drivers/staging/media/atomisp/pci/atomisp_fops.c
> > index f1e6b2597853..e383e17c5072 100644
> > --- a/drivers/staging/media/atomisp/pci/atomisp_fops.c
> > +++ b/drivers/staging/media/atomisp/pci/atomisp_fops.c
> > @@ -1283,7 +1283,8 @@ const struct v4l2_file_operations atomisp_fops = {
> > .unlocked_ioctl = video_ioctl2,
> > #ifdef CONFIG_COMPAT
> > /*
> > - * There are problems with this code. Disable this for now.
> > + * this was removed because of bugs, the interface
> > + * needs to be made safe for compat tasks instead.
> > .compat_ioctl32 = atomisp_compat_ioctl32,
> > */
> > #endif
> > @@ -1297,10 +1298,7 @@ const struct v4l2_file_operations atomisp_file_fops = {
> > .mmap = atomisp_file_mmap,
> > .unlocked_ioctl = video_ioctl2,
> > #ifdef CONFIG_COMPAT
> > - /*
> > - * There are problems with this code. Disable this for now.
> > - .compat_ioctl32 = atomisp_compat_ioctl32,
> > - */
> > + /* .compat_ioctl32 = atomisp_compat_ioctl32, */
> > #endif
> > .poll = atomisp_poll,
Shouldn't they be stubbed with something that returns -ENOTTY
rather than blindly calling the 64bit code with the wrong structure?
David
-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK
Registration No: 1397386 (Wales)