From: Dan Carpenter <dan.carpenter@oracle.com>
To: Gustavo Padovan <gustavo@padovan.org>
Cc: devel@driverdev.osuosl.org,
"Daniel Stone" <daniels@collabora.com>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Riley Andrews" <riandrews@android.com>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
"Arve Hjønnevåg" <arve@android.com>,
"Daniel Vetter" <daniel.vetter@ffwll.ch>,
"Gustavo Padovan" <gustavo.padovan@collabora.co.uk>,
"John Harrison" <John.C.Harrison@Intel.com>
Subject: Re: [PATCH v4 4/5] staging/android: refactor SYNC_IOC_FILE_INFO
Date: Tue, 1 Mar 2016 09:55:58 +0300 [thread overview]
Message-ID: <20160301065558.GZ32153@mwanda> (raw)
In-Reply-To: <1456511507-2534-4-git-send-email-gustavo@padovan.org>
On Fri, Feb 26, 2016 at 03:31:46PM -0300, Gustavo Padovan wrote:
> +no_fences:
> + info->num_fences = sync_file->num_fences;
>
> - if (copy_to_user((void __user *)arg, info, len))
> + if (copy_to_user((void __user *)arg, info, sizeof(*info)))
> ret = -EFAULT;
> else
> ret = 0;
We need to kfree(fence_info) here.
> diff --git a/drivers/staging/android/uapi/sync.h b/drivers/staging/android/uapi/sync.h
> index f0b41ce..9aad623 100644
> --- a/drivers/staging/android/uapi/sync.h
> +++ b/drivers/staging/android/uapi/sync.h
> @@ -42,21 +42,20 @@ struct sync_fence_info {
>
> /**
> * struct sync_file_info - data returned from fence info ioctl
> - * @len: ioctl caller writes the size of the buffer its passing in.
> - * ioctl returns length of sync_file_info returned to
> - * userspace including pt_info.
> * @name: name of fence
> * @status: status of fence. 1: signaled 0:active <0:error
> * @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.
> * @sync_fence_info: array of sync_fence_info for every fence in the sync_file
The documentation needs updating.
> */
> struct sync_file_info {
> - __u32 len;
> char name[32];
> __s32 status;
> __u32 num_fences;
> + __u32 len;
>
> - __u8 sync_fence_info[0];
> + __u64 sync_fence_info;
> };
regards,
dan carpenter
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Dan Carpenter <dan.carpenter@oracle.com>
To: Gustavo Padovan <gustavo@padovan.org>
Cc: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
devel@driverdev.osuosl.org, "Rob Clark" <robdclark@gmail.com>,
"Daniel Stone" <daniels@collabora.com>,
"Daniel Vetter" <daniel.vetter@ffwll.ch>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Riley Andrews" <riandrews@android.com>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
"Arve Hjønnevåg" <arve@android.com>,
"Greg Hackmann" <ghackmann@google.com>,
"Gustavo Padovan" <gustavo.padovan@collabora.co.uk>,
"John Harrison" <John.C.Harrison@Intel.com>
Subject: Re: [PATCH v4 4/5] staging/android: refactor SYNC_IOC_FILE_INFO
Date: Tue, 1 Mar 2016 09:55:58 +0300 [thread overview]
Message-ID: <20160301065558.GZ32153@mwanda> (raw)
In-Reply-To: <1456511507-2534-4-git-send-email-gustavo@padovan.org>
On Fri, Feb 26, 2016 at 03:31:46PM -0300, Gustavo Padovan wrote:
> +no_fences:
> + info->num_fences = sync_file->num_fences;
>
> - if (copy_to_user((void __user *)arg, info, len))
> + if (copy_to_user((void __user *)arg, info, sizeof(*info)))
> ret = -EFAULT;
> else
> ret = 0;
We need to kfree(fence_info) here.
> diff --git a/drivers/staging/android/uapi/sync.h b/drivers/staging/android/uapi/sync.h
> index f0b41ce..9aad623 100644
> --- a/drivers/staging/android/uapi/sync.h
> +++ b/drivers/staging/android/uapi/sync.h
> @@ -42,21 +42,20 @@ struct sync_fence_info {
>
> /**
> * struct sync_file_info - data returned from fence info ioctl
> - * @len: ioctl caller writes the size of the buffer its passing in.
> - * ioctl returns length of sync_file_info returned to
> - * userspace including pt_info.
> * @name: name of fence
> * @status: status of fence. 1: signaled 0:active <0:error
> * @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.
> * @sync_fence_info: array of sync_fence_info for every fence in the sync_file
The documentation needs updating.
> */
> struct sync_file_info {
> - __u32 len;
> char name[32];
> __s32 status;
> __u32 num_fences;
> + __u32 len;
>
> - __u8 sync_fence_info[0];
> + __u64 sync_fence_info;
> };
regards,
dan carpenter
next prev parent reply other threads:[~2016-03-01 6:56 UTC|newest]
Thread overview: 40+ 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 ` 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 ` Gustavo Padovan
2016-02-26 18:31 ` [PATCH v4 3/5] staging/android: remove redundant comments on sync_merge_data Gustavo Padovan
2016-02-26 18:31 ` Gustavo Padovan
2016-02-29 8:31 ` Maarten Lankhorst
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 18:31 ` Gustavo Padovan
2016-02-26 21:00 ` [PATCH] " Gustavo Padovan
2016-02-26 21:00 ` Gustavo Padovan
2016-02-27 2:18 ` Emil Velikov
2016-02-27 2:18 ` Emil Velikov
2016-02-27 15:25 ` Gustavo Padovan
2016-02-27 15:25 ` Gustavo Padovan
2016-02-29 8:34 ` Emil Velikov
2016-02-29 8:34 ` Emil Velikov
2016-02-29 8:26 ` Maarten Lankhorst
2016-02-29 8:26 ` Maarten Lankhorst
2016-02-29 22:08 ` Gustavo Padovan
2016-02-29 22:08 ` Gustavo Padovan
2016-03-01 8:35 ` Maarten Lankhorst
2016-03-01 8:35 ` Maarten Lankhorst
2016-03-01 11:55 ` Gustavo Padovan
2016-03-01 6:55 ` Dan Carpenter [this message]
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-26 18:31 ` Gustavo Padovan
2016-02-27 2:20 ` Emil Velikov
2016-02-27 2:20 ` Emil Velikov
2016-02-27 15:27 ` Gustavo Padovan
2016-02-29 7:59 ` Emil Velikov
2016-02-29 7:59 ` Emil Velikov
2016-02-29 8:30 ` Maarten Lankhorst
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 6:36 ` Dan Carpenter
2016-03-01 11:52 ` Gustavo Padovan
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=20160301065558.GZ32153@mwanda \
--to=dan.carpenter@oracle.com \
--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=gregkh@linuxfoundation.org \
--cc=gustavo.padovan@collabora.co.uk \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.