[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Tue, 2 Feb 2016 16:46:00 -0200
From: Gustavo Padovan <gustavo@...ovan.org>
To: Maarten Lankhorst <maarten.lankhorst@...ux.intel.com>
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
linux-kernel@...r.kernel.org, devel@...verdev.osuosl.org,
dri-devel@...ts.freedesktop.org,
Daniel Stone <daniels@...labora.com>,
Arve Hjønnevåg <arve@...roid.com>,
Riley Andrews <riandrews@...roid.com>,
Daniel Vetter <daniel.vetter@...ll.ch>,
Rob Clark <robdclark@...il.com>,
Greg Hackmann <ghackmann@...gle.com>,
John Harrison <John.C.Harrison@...el.com>,
Gustavo Padovan <gustavo.padovan@...labora.co.uk>
Subject: Re: [PATCH v2 08/11] staging/android: make info->len return only the
size of fence_infos
2016-02-02 Maarten Lankhorst <maarten.lankhorst@...ux.intel.com>:
> Op 02-02-16 om 14:23 schreef Gustavo Padovan:
> > From: Gustavo Padovan <gustavo.padovan@...labora.co.uk>
> >
> > The len member of struct sync_file_info was returning the size of the whole
> > buffer (struct sync_file_info + fence_infos at the of it). This commit
> > change it to return only the size of the array of fence_infos.
> >
> > It also moves len to be right before the fences_infos struct.
> >
> > Signed-off-by: Gustavo Padovan <gustavo.padovan@...labora.co.uk>
> > ---
> > drivers/staging/android/sync.c | 16 +++++++++++-----
> > drivers/staging/android/uapi/sync.h | 7 +++----
> > 2 files changed, 14 insertions(+), 9 deletions(-)
> >
> > diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c
> > index ba7d461..e5fbf5a 100644
> > --- a/drivers/staging/android/sync.c
> > +++ b/drivers/staging/android/sync.c
> > @@ -502,14 +502,19 @@ static int sync_fill_fence_info(struct fence *fence, void *data, int size)
> > static long sync_file_ioctl_fence_info(struct sync_file *sync_file,
> > unsigned long arg)
> > {
> > - struct sync_file_info *info;
> > + struct sync_file_info in, *info;
> > __u32 size;
> > - __u32 len = 0;
> > + __u32 b_len, len = 0;
> > int ret, i;
> >
> > - if (copy_from_user(&size, (void __user *)arg, sizeof(size)))
> > + if (copy_from_user(&in, (void __user *)arg, sizeof(*info)))
> > return -EFAULT;
> >
> > + if (in.name || in.status || in.num_fences || in.fence_info)
> > + return -EFAULT;
> >
> Did you test this? I think in.name is always true..
Ugh, no! These checks were last change I made so I think I forgot to
test them properly.
Gustavo
Powered by blists - more mailing lists