From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm: Check for lessee in DROP_MASTER ioctl Date: Tue, 30 Jan 2018 10:34:47 +0100 Message-ID: <20180130093447.GG25930@phenom.ffwll.local> References: <20180119015159.1606-1-keithp@keithp.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2F9BE6E715 for ; Tue, 30 Jan 2018 09:34:51 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id i186so19645060wmi.4 for ; Tue, 30 Jan 2018 01:34:50 -0800 (PST) Content-Disposition: inline In-Reply-To: <20180119015159.1606-1-keithp@keithp.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Keith Packard Cc: Dave Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCBKYW4gMTgsIDIwMTggYXQgMDU6NTE6NTlQTSAtMDgwMCwgS2VpdGggUGFja2FyZCB3 cm90ZToKPiBEb24ndCBsZXQgYSBsZXNzZWUgY29udHJvbCB3aGF0IHRoZSBjdXJyZW50IERSTSBt YXN0ZXIgaXMgc2V0IHRvOwo+IHRoYXQncyB0aGUgam9iIG9mIHRoZSAicmVhbCIgbWFzdGVyLiBP dGhlcndpc2UsIHRoZSBsZXNzZWUgd291bGQKPiBkaXNhYmxlIGFsbCBhY2Nlc3MgdG8gbWFzdGVy IG9wZXJhdGlvbnMgZm9yIHRoZSBvd25lciBhbmQgYWxsIGxlc3NlZXMKPiB1bmRlciBpdC4KPiAK PiBUaGlzIG1hdGNoZXMgdGhlIHNhbWUgY2hlY2sgbWFkZSBpbiB0aGUgU0VUX01BU1RFUiBpb2N0 bC4KPiAKPiBTaWduZWQtb2ZmLWJ5OiBLZWl0aCBQYWNrYXJkIDxrZWl0aHBAa2VpdGhwLmNvbT4K ClNpbWlsYXIgY2hlY2sgZm9yIHNldG1hc3RlciBhbHJlYWR5IGV4aXN0cywgc28gbG9va3MgYWxs IGdvb2QuIERvIHdlIGhhdmUKYW4gaWd0IGZvciBhbGwgdGhpcz8gSWlyYyB0aGVyZSB3YXMgb25l IGZsb2F0aW5nIGFyb3VuZCwgYnV0IG5vIGlkZWEKd2hhdCdzIHRoZSBzdGF0dXMuIE1pZ2h0IGFs c28gYmUgZ29vZCB0byByZXN1Ym1pdCB0aGVtIHNvIGk5MTUgQ0kgY2FuIHJ1bgp0aGUgdGVzdHMg KG5vdyB0aGF0IHRoZSBjb2RlIGhhcyBsYW5kZWQpLgoKT24gdGhlIHBhdGNoIGl0c2VsZiwgbWlu dXMgbGFjayBvZiB0ZXN0Y2FzZXM6CgpSZXZpZXdlZC1ieTogRGFuaWVsIFZldHRlciA8ZGFuaWVs LnZldHRlckBmZndsbC5jaD4KCj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9kcm1fYXV0aC5jIHwg NiArKysrKysKPiAgMSBmaWxlIGNoYW5nZWQsIDYgaW5zZXJ0aW9ucygrKQo+IAo+IGRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F1dGguYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXV0 aC5jCj4gaW5kZXggYWFkNDY4ZDE3MGE3Li5kOWMwZjc1NzM5MDUgMTAwNjQ0Cj4gLS0tIGEvZHJp dmVycy9ncHUvZHJtL2RybV9hdXRoLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F1dGgu Ywo+IEBAIC0yMzAsNiArMjMwLDEyIEBAIGludCBkcm1fZHJvcG1hc3Rlcl9pb2N0bChzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAo+ICAJaWYgKCFkZXYtPm1hc3RlcikKPiAgCQln b3RvIG91dF91bmxvY2s7Cj4gIAo+ICsJaWYgKGZpbGVfcHJpdi0+bWFzdGVyLT5sZXNzb3IgIT0g TlVMTCkgewo+ICsJCURSTV9ERUJVR19MRUFTRSgiQXR0ZW1wdCB0byBkcm9wIGxlc3NlZSAlZCBh cyBtYXN0ZXJcbiIsIGZpbGVfcHJpdi0+bWFzdGVyLT5sZXNzZWVfaWQpOwo+ICsJCXJldCA9IC1F SU5WQUw7Cj4gKwkJZ290byBvdXRfdW5sb2NrOwo+ICsJfQo+ICsKPiAgCXJldCA9IDA7Cj4gIAlk cm1fZHJvcF9tYXN0ZXIoZGV2LCBmaWxlX3ByaXYpOwo+ICBvdXRfdW5sb2NrOgo+IC0tIAo+IDIu MTUuMQo+IAoKLS0gCkRhbmllbCBWZXR0ZXIKU29mdHdhcmUgRW5naW5lZXIsIEludGVsIENvcnBv cmF0aW9uCmh0dHA6Ly9ibG9nLmZmd2xsLmNoCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751541AbeA3Jey (ORCPT ); Tue, 30 Jan 2018 04:34:54 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:52877 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751219AbeA3Jeu (ORCPT ); Tue, 30 Jan 2018 04:34:50 -0500 X-Google-Smtp-Source: AH8x224FPLpvr9MSVqSHIHZhPldzjAlb9KzkKWq6MRCrj0oJXBh2R6nxNnz/mmb2Ec3R8zsOOAIchA== Date: Tue, 30 Jan 2018 10:34:47 +0100 From: Daniel Vetter To: Keith Packard Cc: linux-kernel@vger.kernel.org, Dave Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org Subject: Re: [PATCH] drm: Check for lessee in DROP_MASTER ioctl Message-ID: <20180130093447.GG25930@phenom.ffwll.local> Mail-Followup-To: Keith Packard , linux-kernel@vger.kernel.org, Dave Airlie , dri-devel@lists.freedesktop.org References: <20180119015159.1606-1-keithp@keithp.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180119015159.1606-1-keithp@keithp.com> X-Operating-System: Linux phenom 4.14.0-1-amd64 User-Agent: Mutt/1.9.2 (2017-12-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jan 18, 2018 at 05:51:59PM -0800, Keith Packard wrote: > Don't let a lessee control what the current DRM master is set to; > that's the job of the "real" master. Otherwise, the lessee would > disable all access to master operations for the owner and all lessees > under it. > > This matches the same check made in the SET_MASTER ioctl. > > Signed-off-by: Keith Packard Similar check for setmaster already exists, so looks all good. Do we have an igt for all this? Iirc there was one floating around, but no idea what's the status. Might also be good to resubmit them so i915 CI can run the tests (now that the code has landed). On the patch itself, minus lack of testcases: Reviewed-by: Daniel Vetter > --- > drivers/gpu/drm/drm_auth.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c > index aad468d170a7..d9c0f7573905 100644 > --- a/drivers/gpu/drm/drm_auth.c > +++ b/drivers/gpu/drm/drm_auth.c > @@ -230,6 +230,12 @@ int drm_dropmaster_ioctl(struct drm_device *dev, void *data, > if (!dev->master) > goto out_unlock; > > + if (file_priv->master->lessor != NULL) { > + DRM_DEBUG_LEASE("Attempt to drop lessee %d as master\n", file_priv->master->lessee_id); > + ret = -EINVAL; > + goto out_unlock; > + } > + > ret = 0; > drm_drop_master(dev, file_priv); > out_unlock: > -- > 2.15.1 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch