From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
To: Emil Velikov <emil.l.velikov@gmail.com>
Cc: "Gustavo Padovan" <gustavo@padovan.org>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
devel@driverdev.osuosl.org,
"Daniel Stone" <daniels@collabora.com>,
"Daniel Vetter" <daniel.vetter@ffwll.ch>,
"Riley Andrews" <riandrews@android.com>,
"ML dri-devel" <dri-devel@lists.freedesktop.org>,
"Linux-Kernel@Vger. Kernel. Org" <linux-kernel@vger.kernel.org>,
"Arve Hjønnevåg" <arve@android.com>,
"John Harrison" <John.C.Harrison@intel.com>
Subject: Re: [PATCH v4 5/5] staging/android: add flags member to sync ioctl structs
Date: Sat, 27 Feb 2016 12:27:56 -0300 [thread overview]
Message-ID: <20160227152756.GC20887@joana> (raw)
In-Reply-To: <CACvgo53nNL8VRdNH9CUOKiErukpqg2e0t1Q3g-xd1XfvLcr_sQ@mail.gmail.com>
Hi Emil,
2016-02-27 Emil Velikov <emil.l.velikov@gmail.com>:
> Hi Gustavo,
>
> On 26 February 2016 at 18:31, Gustavo Padovan <gustavo@padovan.org> wrote:
> > From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
> >
> > Play safe and add flags member to all structs. So we don't need to
> > break API or create new IOCTL in the future if new features that requires
> > flags arises.
> >
> > v2: check if flags are valid (zero, in this case)
> >
> > Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
> > ---
> > drivers/staging/android/sync.c | 7 ++++++-
> > drivers/staging/android/uapi/sync.h | 6 ++++++
> > 2 files changed, 12 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c
> > index 837cff5..54fd5ab 100644
> > --- a/drivers/staging/android/sync.c
> > +++ b/drivers/staging/android/sync.c
> > @@ -445,6 +445,11 @@ static long sync_file_ioctl_merge(struct sync_file *sync_file,
> > goto err_put_fd;
> > }
> >
> > + if (data.flags) {
> > + err = -EFAULT;
> -EINVAL ?
>
> > + goto err_put_fd;
> > + }
> > +
> > fence2 = sync_file_fdget(data.fd2);
> > if (!fence2) {
> > err = -ENOENT;
> > @@ -511,7 +516,7 @@ static long sync_file_ioctl_fence_info(struct sync_file *sync_file,
> > if (copy_from_user(&in, (void __user *)arg, sizeof(*info)))
> > return -EFAULT;
> >
> > - if (in.status || strcmp(in.name, "\0"))
> > + if (in.status || in.flags || strcmp(in.name, "\0"))
> > return -EFAULT;
> -EINVAL ?
>
> >
> > if (in.num_fences && !in.sync_fence_info)
> > diff --git a/drivers/staging/android/uapi/sync.h b/drivers/staging/android/uapi/sync.h
> > index 9aad623..f56a6c2 100644
> > --- a/drivers/staging/android/uapi/sync.h
> > +++ b/drivers/staging/android/uapi/sync.h
> > @@ -19,11 +19,13 @@
> > * @fd2: file descriptor of second fence
> > * @name: name of new fence
> > * @fence: returns the fd of the new fence to userspace
> > + * @flags: merge_data flags
> > */
> > struct sync_merge_data {
> > __s32 fd2;
> > char name[32];
> > __s32 fence;
> > + __u32 flags;
> The overall size of the struct is not multiple of 64bit, so things
> will end up badly if we decide to extend it in the future. Even if
> there's a small chance that update will be needed, we might as well
> pad it now (and check the padding for zero, returning -EINVAL).
I think name could be the first field here.
>
> > };
> >
> > /**
> > @@ -31,12 +33,14 @@ struct sync_merge_data {
> > * @obj_name: name of parent sync_timeline
> > * @driver_name: name of driver implementing the parent
> > * @status: status of the fence 0:active 1:signaled <0:error
> > + * @flags: fence_info flags
> > * @timestamp_ns: timestamp of status change in nanoseconds
> > */
> > struct sync_fence_info {
> > char obj_name[32];
> > char driver_name[32];
> > __s32 status;
> > + __u32 flags;
> > __u64 timestamp_ns;
> Should we be doing some form of validation in sync_fill_fence_info()
> of 'flags' ?
Do you think it is necessary? The kernel allocates a zero'ed buffer to
fill sync_fence_info array.
Gustavo
next prev parent reply other threads:[~2016-02-27 15:28 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-26 18:31 [PATCH v4 1/5] staging/android: add num_fences field to struct sync_file_info Gustavo Padovan
2016-02-26 18:31 ` [PATCH v4 2/5] staging/android: rename SYNC_IOC_FENCE_INFO Gustavo Padovan
2016-02-26 18:31 ` [PATCH v4 3/5] staging/android: remove redundant comments on sync_merge_data Gustavo Padovan
2016-02-29 8:31 ` Maarten Lankhorst
2016-02-26 18:31 ` [PATCH v4 4/5] staging/android: refactor SYNC_IOC_FILE_INFO Gustavo Padovan
2016-02-26 21:00 ` [PATCH] " Gustavo Padovan
2016-02-27 2:18 ` Emil Velikov
2016-02-27 15:25 ` Gustavo Padovan
2016-02-29 8:34 ` Emil Velikov
2016-02-29 8:26 ` Maarten Lankhorst
2016-02-29 22:08 ` Gustavo Padovan
2016-03-01 8:35 ` Maarten Lankhorst
2016-03-01 11:55 ` Gustavo Padovan
2016-03-01 6:55 ` [PATCH v4 4/5] " Dan Carpenter
2016-02-26 18:31 ` [PATCH v4 5/5] staging/android: add flags member to sync ioctl structs Gustavo Padovan
2016-02-27 2:20 ` Emil Velikov
2016-02-27 15:27 ` Gustavo Padovan [this message]
2016-02-29 7:59 ` Emil Velikov
2016-02-29 8:30 ` Maarten Lankhorst
2016-03-01 6:36 ` [PATCH v4 1/5] staging/android: add num_fences field to struct sync_file_info Dan Carpenter
2016-03-01 11:52 ` Gustavo Padovan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160227152756.GC20887@joana \
--to=gustavo.padovan@collabora.co.uk \
--cc=John.C.Harrison@intel.com \
--cc=arve@android.com \
--cc=daniel.vetter@ffwll.ch \
--cc=daniels@collabora.com \
--cc=devel@driverdev.osuosl.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=emil.l.velikov@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=gustavo@padovan.org \
--cc=linux-kernel@vger.kernel.org \
--cc=riandrews@android.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).