From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: Re: [PATCH v4 4/5] staging/android: refactor SYNC_IOC_FILE_INFO Date: Tue, 1 Mar 2016 09:55:58 +0300 Message-ID: <20160301065558.GZ32153@mwanda> References: <1456511507-2534-1-git-send-email-gustavo@padovan.org> <1456511507-2534-4-git-send-email-gustavo@padovan.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from userp1040.oracle.com (userp1040.oracle.com [156.151.31.81]) by gabe.freedesktop.org (Postfix) with ESMTPS id 587FB6E427 for ; Tue, 1 Mar 2016 06:56:10 +0000 (UTC) Content-Disposition: inline In-Reply-To: <1456511507-2534-4-git-send-email-gustavo@padovan.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Gustavo Padovan Cc: devel@driverdev.osuosl.org, Daniel Stone , Greg Kroah-Hartman , Riley Andrews , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Arve =?iso-8859-1?B?SGr4bm5lduVn?= , Daniel Vetter , Gustavo Padovan , John Harrison List-Id: dri-devel@lists.freedesktop.org T24gRnJpLCBGZWIgMjYsIDIwMTYgYXQgMDM6MzE6NDZQTSAtMDMwMCwgR3VzdGF2byBQYWRvdmFu IHdyb3RlOgo+ICtub19mZW5jZXM6Cj4gKwlpbmZvLT5udW1fZmVuY2VzID0gc3luY19maWxlLT5u dW1fZmVuY2VzOwo+ICAKPiAtCWlmIChjb3B5X3RvX3VzZXIoKHZvaWQgX191c2VyICopYXJnLCBp bmZvLCBsZW4pKQo+ICsJaWYgKGNvcHlfdG9fdXNlcigodm9pZCBfX3VzZXIgKilhcmcsIGluZm8s IHNpemVvZigqaW5mbykpKQo+ICAJCXJldCA9IC1FRkFVTFQ7Cj4gIAllbHNlCj4gIAkJcmV0ID0g MDsKCldlIG5lZWQgdG8ga2ZyZWUoZmVuY2VfaW5mbykgaGVyZS4KCj4gZGlmZiAtLWdpdCBhL2Ry aXZlcnMvc3RhZ2luZy9hbmRyb2lkL3VhcGkvc3luYy5oIGIvZHJpdmVycy9zdGFnaW5nL2FuZHJv aWQvdWFwaS9zeW5jLmgKPiBpbmRleCBmMGI0MWNlLi45YWFkNjIzIDEwMDY0NAo+IC0tLSBhL2Ry aXZlcnMvc3RhZ2luZy9hbmRyb2lkL3VhcGkvc3luYy5oCj4gKysrIGIvZHJpdmVycy9zdGFnaW5n L2FuZHJvaWQvdWFwaS9zeW5jLmgKPiBAQCAtNDIsMjEgKzQyLDIwIEBAIHN0cnVjdCBzeW5jX2Zl bmNlX2luZm8gewo+ICAKPiAgLyoqCj4gICAqIHN0cnVjdCBzeW5jX2ZpbGVfaW5mbyAtIGRhdGEg cmV0dXJuZWQgZnJvbSBmZW5jZSBpbmZvIGlvY3RsCj4gLSAqIEBsZW46CWlvY3RsIGNhbGxlciB3 cml0ZXMgdGhlIHNpemUgb2YgdGhlIGJ1ZmZlciBpdHMgcGFzc2luZyBpbi4KPiAtICoJCWlvY3Rs IHJldHVybnMgbGVuZ3RoIG9mIHN5bmNfZmlsZV9pbmZvIHJldHVybmVkIHRvCj4gLSAqCQl1c2Vy c3BhY2UgaW5jbHVkaW5nIHB0X2luZm8uCj4gICAqIEBuYW1lOgluYW1lIG9mIGZlbmNlCj4gICAq IEBzdGF0dXM6CXN0YXR1cyBvZiBmZW5jZS4gMTogc2lnbmFsZWQgMDphY3RpdmUgPDA6ZXJyb3IK PiAgICogQG51bV9mZW5jZXMJbnVtYmVyIG9mIGZlbmNlcyBpbiB0aGUgc3luY19maWxlCj4gKyAq IEBsZW46CWlvY3RsIGNhbGxlciB3cml0ZXMgdGhlIHNpemUgb2YgdGhlIGJ1ZmZlciBpdHMgcGFz c2luZyBpbi4KPiArICoJCWlvY3RsIHJldHVybnMgbGVuZ3RoIG9mIGFsbCBmZW5jZV9pbmZvcyBz dW1tZWQuCj4gICAqIEBzeW5jX2ZlbmNlX2luZm86IGFycmF5IG9mIHN5bmNfZmVuY2VfaW5mbyBm b3IgZXZlcnkgZmVuY2UgaW4gdGhlIHN5bmNfZmlsZQoKVGhlIGRvY3VtZW50YXRpb24gbmVlZHMg dXBkYXRpbmcuCgo+ICAgKi8KPiAgc3RydWN0IHN5bmNfZmlsZV9pbmZvIHsKPiAtCV9fdTMyCWxl bjsKPiAgCWNoYXIJbmFtZVszMl07Cj4gIAlfX3MzMglzdGF0dXM7Cj4gIAlfX3UzMgludW1fZmVu Y2VzOwo+ICsJX191MzIJbGVuOwo+ICAKPiAtCV9fdTgJc3luY19mZW5jZV9pbmZvWzBdOwo+ICsJ X191NjQJc3luY19mZW5jZV9pbmZvOwo+ICB9OwoKCnJlZ2FyZHMsCmRhbiBjYXJwZW50ZXIKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1h aWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752165AbcCAG4N (ORCPT ); Tue, 1 Mar 2016 01:56:13 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:42239 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751259AbcCAG4L (ORCPT ); Tue, 1 Mar 2016 01:56:11 -0500 Date: Tue, 1 Mar 2016 09:55:58 +0300 From: Dan Carpenter To: Gustavo Padovan Cc: Greg Kroah-Hartman , devel@driverdev.osuosl.org, Rob Clark , Daniel Stone , Daniel Vetter , Maarten Lankhorst , Riley Andrews , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Arve =?iso-8859-1?B?SGr4bm5lduVn?= , Greg Hackmann , Gustavo Padovan , John Harrison Subject: Re: [PATCH v4 4/5] staging/android: refactor SYNC_IOC_FILE_INFO Message-ID: <20160301065558.GZ32153@mwanda> References: <1456511507-2534-1-git-send-email-gustavo@padovan.org> <1456511507-2534-4-git-send-email-gustavo@padovan.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1456511507-2534-4-git-send-email-gustavo@padovan.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: userv0022.oracle.com [156.151.31.74] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.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