From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: Re: [PATCH v2 08/11] staging/android: make info->len return only the size of fence_infos Date: Tue, 2 Feb 2016 15:18:46 +0100 Message-ID: <56B0BAC6.30506@linux.intel.com> References: <1454419402-10769-1-git-send-email-gustavo@padovan.org> <1454419402-10769-9-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 519E66E045 for ; Tue, 2 Feb 2016 06:18:51 -0800 (PST) In-Reply-To: <1454419402-10769-9-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 , Greg Kroah-Hartman Cc: devel@driverdev.osuosl.org, Daniel Stone , Daniel Vetter , Riley Andrews , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, =?UTF-8?Q?Arve_Hj=c3=b8nnev=c3=a5g?= , Gustavo Padovan , John Harrison List-Id: dri-devel@lists.freedesktop.org T3AgMDItMDItMTYgb20gMTQ6MjMgc2NocmVlZiBHdXN0YXZvIFBhZG92YW46Cj4gRnJvbTogR3Vz dGF2byBQYWRvdmFuIDxndXN0YXZvLnBhZG92YW5AY29sbGFib3JhLmNvLnVrPgo+Cj4gVGhlIGxl biBtZW1iZXIgb2Ygc3RydWN0IHN5bmNfZmlsZV9pbmZvIHdhcyByZXR1cm5pbmcgdGhlIHNpemUg b2YgdGhlIHdob2xlCj4gYnVmZmVyIChzdHJ1Y3Qgc3luY19maWxlX2luZm8gKyBmZW5jZV9pbmZv cyBhdCB0aGUgb2YgaXQpLiBUaGlzIGNvbW1pdAo+IGNoYW5nZSBpdCB0byByZXR1cm4gb25seSB0 aGUgc2l6ZSBvZiB0aGUgYXJyYXkgb2YgZmVuY2VfaW5mb3MuCj4KPiBJdCBhbHNvIG1vdmVzIGxl biB0byBiZSByaWdodCBiZWZvcmUgdGhlIGZlbmNlc19pbmZvcyBzdHJ1Y3QuCj4KPiBTaWduZWQt b2ZmLWJ5OiBHdXN0YXZvIFBhZG92YW4gPGd1c3Rhdm8ucGFkb3ZhbkBjb2xsYWJvcmEuY28udWs+ Cj4gLS0tCj4gIGRyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL3N5bmMuYyAgICAgIHwgMTYgKysrKysr KysrKystLS0tLQo+ICBkcml2ZXJzL3N0YWdpbmcvYW5kcm9pZC91YXBpL3N5bmMuaCB8ICA3ICsr Ky0tLS0KPiAgMiBmaWxlcyBjaGFuZ2VkLCAxNCBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygt KQo+Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL3N5bmMuYyBiL2RyaXZl cnMvc3RhZ2luZy9hbmRyb2lkL3N5bmMuYwo+IGluZGV4IGJhN2Q0NjEuLmU1ZmJmNWEgMTAwNjQ0 Cj4gLS0tIGEvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvc3luYy5jCj4gKysrIGIvZHJpdmVycy9z dGFnaW5nL2FuZHJvaWQvc3luYy5jCj4gQEAgLTUwMiwxNCArNTAyLDE5IEBAIHN0YXRpYyBpbnQg c3luY19maWxsX2ZlbmNlX2luZm8oc3RydWN0IGZlbmNlICpmZW5jZSwgdm9pZCAqZGF0YSwgaW50 IHNpemUpCj4gIHN0YXRpYyBsb25nIHN5bmNfZmlsZV9pb2N0bF9mZW5jZV9pbmZvKHN0cnVjdCBz eW5jX2ZpbGUgKnN5bmNfZmlsZSwKPiAgCQkJCQl1bnNpZ25lZCBsb25nIGFyZykKPiAgewo+IC0J c3RydWN0IHN5bmNfZmlsZV9pbmZvICppbmZvOwo+ICsJc3RydWN0IHN5bmNfZmlsZV9pbmZvIGlu LCAqaW5mbzsKPiAgCV9fdTMyIHNpemU7Cj4gLQlfX3UzMiBsZW4gPSAwOwo+ICsJX191MzIgYl9s ZW4sIGxlbiA9IDA7Cj4gIAlpbnQgcmV0LCBpOwo+ICAKPiAtCWlmIChjb3B5X2Zyb21fdXNlcigm c2l6ZSwgKHZvaWQgX191c2VyICopYXJnLCBzaXplb2Yoc2l6ZSkpKQo+ICsJaWYgKGNvcHlfZnJv bV91c2VyKCZpbiwgKHZvaWQgX191c2VyICopYXJnLCBzaXplb2YoKmluZm8pKSkKPiAgCQlyZXR1 cm4gLUVGQVVMVDsKPiAgCj4gKwlpZiAoaW4ubmFtZSB8fCBpbi5zdGF0dXMgfHwgaW4ubnVtX2Zl bmNlcyB8fCBpbi5mZW5jZV9pbmZvKQo+ICsJCXJldHVybiAtRUZBVUxUOwo+CkRpZCB5b3UgdGVz dCB0aGlzPyBJIHRoaW5rIGluLm5hbWUgaXMgYWx3YXlzIHRydWUuLgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRy aS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755010AbcBBOSy (ORCPT ); Tue, 2 Feb 2016 09:18:54 -0500 Received: from mga09.intel.com ([134.134.136.24]:60765 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751011AbcBBOSv (ORCPT ); Tue, 2 Feb 2016 09:18:51 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,384,1449561600"; d="scan'208";a="903886574" Subject: Re: [PATCH v2 08/11] staging/android: make info->len return only the size of fence_infos To: Gustavo Padovan , Greg Kroah-Hartman References: <1454419402-10769-1-git-send-email-gustavo@padovan.org> <1454419402-10769-9-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: <56B0BAC6.30506@linux.intel.com> Date: Tue, 2 Feb 2016 15:18:46 +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: <1454419402-10769-9-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 02-02-16 om 14:23 schreef Gustavo Padovan: > From: Gustavo Padovan > > 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 > --- > 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..