From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH] drm/drm_ioctl.c: Test client capability value early when setting. Date: Wed, 28 Feb 2018 17:40:41 +0200 Message-ID: <20180228154041.GK5453@intel.com> References: <20180228152741.22507-1-Liviu.Dudau@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9CF006E99D for ; Wed, 28 Feb 2018 15:40:45 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20180228152741.22507-1-Liviu.Dudau@arm.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Liviu Dudau Cc: David Airlie , Daniel Vetter , LKML , DRI-devel List-Id: dri-devel@lists.freedesktop.org T24gV2VkLCBGZWIgMjgsIDIwMTggYXQgMDM6Mjc6NDFQTSArMDAwMCwgTGl2aXUgRHVkYXUgd3Jv dGU6Cj4gVGhlIGRybV9zZXRjbGllbnRjYXAoKSBmdW5jdGlvbiBpbXBsZW1lbnRpbmcgdGhlIERS TV9JT0NUTF9TRVRfQ0xJRU5UX0NBUAo+IGlvY3RsIGV4cGVjdHMgdGhhdCBhbnkgY2FwYWJpbGl0 eSBzZXQgYnkgdGhlIGNsaWVudCB3aWxsIGhhdmUgYSB2YWx1ZSBvZiAxLgo+IE1ha2UgdGhlIGNo ZWNrIGVhcmx5IHNvIHRoYXQgd2UgZG9uJ3QgaGF2ZSB0byB0ZXN0IHRoZSB2YWx1ZSBmb3IgZWFj aAo+IGNhcGFiaWxpdHkuCgpXaGF0IGlmIHdlIHdhbnQgYSBhIG5vbi1ib29sZWFuIGNhcGFiaWxp dHkgYXQgc29tZSBwb2ludD8KCj4gCj4gU2lnbmVkLW9mZi1ieTogTGl2aXUgRHVkYXUgPGxpdml1 LmR1ZGF1QGFybS5jb20+Cj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9kcm1faW9jdGwuYyB8IDkg KysrLS0tLS0tCj4gIDEgZmlsZSBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25z KC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1faW9jdGwuYyBiL2RyaXZl cnMvZ3B1L2RybS9kcm1faW9jdGwuYwo+IGluZGV4IGFmNzgyOTExYzUwNS4uMDJmZmEwZThkNzdi IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1faW9jdGwuYwo+ICsrKyBiL2RyaXZl cnMvZ3B1L2RybS9kcm1faW9jdGwuYwo+IEBAIC0zMDYsMjIgKzMwNiwxOSBAQCBkcm1fc2V0Y2xp ZW50Y2FwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsIHN0cnVjdCBkcm1fZmls ZSAqZmlsZV9wcml2KQo+ICB7Cj4gIAlzdHJ1Y3QgZHJtX3NldF9jbGllbnRfY2FwICpyZXEgPSBk YXRhOwo+ICAKPiArCWlmIChyZXEtPnZhbHVlID4gMSkKPiArCQlyZXR1cm4gLUVJTlZBTDsKPiAr Cj4gIAlzd2l0Y2ggKHJlcS0+Y2FwYWJpbGl0eSkgewo+ICAJY2FzZSBEUk1fQ0xJRU5UX0NBUF9T VEVSRU9fM0Q6Cj4gLQkJaWYgKHJlcS0+dmFsdWUgPiAxKQo+IC0JCQlyZXR1cm4gLUVJTlZBTDsK PiAgCQlmaWxlX3ByaXYtPnN0ZXJlb19hbGxvd2VkID0gcmVxLT52YWx1ZTsKPiAgCQlicmVhazsK PiAgCWNhc2UgRFJNX0NMSUVOVF9DQVBfVU5JVkVSU0FMX1BMQU5FUzoKPiAtCQlpZiAocmVxLT52 YWx1ZSA+IDEpCj4gLQkJCXJldHVybiAtRUlOVkFMOwo+ICAJCWZpbGVfcHJpdi0+dW5pdmVyc2Fs X3BsYW5lcyA9IHJlcS0+dmFsdWU7Cj4gIAkJYnJlYWs7Cj4gIAljYXNlIERSTV9DTElFTlRfQ0FQ X0FUT01JQzoKPiAgCQlpZiAoIWRybV9jb3JlX2NoZWNrX2ZlYXR1cmUoZGV2LCBEUklWRVJfQVRP TUlDKSkKPiAgCQkJcmV0dXJuIC1FSU5WQUw7Cj4gLQkJaWYgKHJlcS0+dmFsdWUgPiAxKQo+IC0J CQlyZXR1cm4gLUVJTlZBTDsKPiAgCQlmaWxlX3ByaXYtPmF0b21pYyA9IHJlcS0+dmFsdWU7Cj4g IAkJZmlsZV9wcml2LT51bml2ZXJzYWxfcGxhbmVzID0gcmVxLT52YWx1ZTsKPiAgCQlicmVhazsK PiAtLSAKPiAyLjE2LjIKPiAKPiBfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwo+IGRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKPiBkcmktZGV2ZWxAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCj4gaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9kcmktZGV2ZWwKCi0tIApWaWxsZSBTeXJqw6Rsw6QKSW50ZWwgT1RDCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxp c3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933149AbeB1Pkr (ORCPT ); Wed, 28 Feb 2018 10:40:47 -0500 Received: from mga17.intel.com ([192.55.52.151]:47952 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932362AbeB1Pkp (ORCPT ); Wed, 28 Feb 2018 10:40:45 -0500 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,406,1515484800"; d="scan'208";a="34814127" Date: Wed, 28 Feb 2018 17:40:41 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Liviu Dudau Cc: DRI-devel , David Airlie , Daniel Vetter , LKML Subject: Re: [PATCH] drm/drm_ioctl.c: Test client capability value early when setting. Message-ID: <20180228154041.GK5453@intel.com> References: <20180228152741.22507-1-Liviu.Dudau@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20180228152741.22507-1-Liviu.Dudau@arm.com> User-Agent: Mutt/1.7.2 (2016-11-26) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Feb 28, 2018 at 03:27:41PM +0000, Liviu Dudau wrote: > The drm_setclientcap() function implementing the DRM_IOCTL_SET_CLIENT_CAP > ioctl expects that any capability set by the client will have a value of 1. > Make the check early so that we don't have to test the value for each > capability. What if we want a a non-boolean capability at some point? > > Signed-off-by: Liviu Dudau > --- > drivers/gpu/drm/drm_ioctl.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c > index af782911c505..02ffa0e8d77b 100644 > --- a/drivers/gpu/drm/drm_ioctl.c > +++ b/drivers/gpu/drm/drm_ioctl.c > @@ -306,22 +306,19 @@ drm_setclientcap(struct drm_device *dev, void *data, struct drm_file *file_priv) > { > struct drm_set_client_cap *req = data; > > + if (req->value > 1) > + return -EINVAL; > + > switch (req->capability) { > case DRM_CLIENT_CAP_STEREO_3D: > - if (req->value > 1) > - return -EINVAL; > file_priv->stereo_allowed = req->value; > break; > case DRM_CLIENT_CAP_UNIVERSAL_PLANES: > - if (req->value > 1) > - return -EINVAL; > file_priv->universal_planes = req->value; > break; > case DRM_CLIENT_CAP_ATOMIC: > if (!drm_core_check_feature(dev, DRIVER_ATOMIC)) > return -EINVAL; > - if (req->value > 1) > - return -EINVAL; > file_priv->atomic = req->value; > file_priv->universal_planes = req->value; > break; > -- > 2.16.2 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Ville Syrjälä Intel OTC