From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752784AbcB2Iay (ORCPT ); Mon, 29 Feb 2016 03:30:54 -0500 Received: from mga09.intel.com ([134.134.136.24]:10745 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752693AbcB2Iau (ORCPT ); Mon, 29 Feb 2016 03:30:50 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,519,1449561600"; d="scan'208";a="661027545" Subject: Re: [PATCH v4 5/5] staging/android: add flags member to sync ioctl structs To: Gustavo Padovan , Greg Kroah-Hartman References: <1456511507-2534-1-git-send-email-gustavo@padovan.org> <1456511507-2534-5-git-send-email-gustavo@padovan.org> Cc: linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, dri-devel@lists.freedesktop.org, Daniel Stone , =?UTF-8?Q?Arve_Hj=c3=b8nnev=c3=a5g?= , Riley Andrews , Daniel Vetter , Rob Clark , Greg Hackmann , John Harrison , Gustavo Padovan From: Maarten Lankhorst Message-ID: <56D401B1.7080200@linux.intel.com> Date: Mon, 29 Feb 2016 09:30:41 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.1.0 MIME-Version: 1.0 In-Reply-To: <1456511507-2534-5-git-send-email-gustavo@padovan.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Op 26-02-16 om 19:31 schreef Gustavo Padovan: > From: Gustavo Padovan > > 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 > --- > 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; > + goto err_put_fd; > + } -EINVAL > 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; > }; > > /** > @@ -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; > }; > > @@ -44,6 +48,7 @@ struct sync_fence_info { > * struct sync_file_info - data returned from fence info ioctl > * @name: name of fence > * @status: status of fence. 1: signaled 0:active <0:error > + * @flags: sync_file_info flags > * @num_fences number of fences in the sync_file > * @len: ioctl caller writes the size of the buffer its passing in. > * ioctl returns length of all fence_infos summed. > @@ -52,6 +57,7 @@ struct sync_fence_info { > struct sync_file_info { > char name[32]; > __s32 status; > + __u32 flags; > __u32 num_fences; > __u32 len; >