From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.14 121/123] drm: Reorder set_property_atomic to avoid returning with an active ww_ctx Date: Wed, 27 Mar 2019 14:16:25 -0400 Message-ID: <20190327181628.15899-121-sashal@kernel.org> References: <20190327181628.15899-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5EDD96E273 for ; Wed, 27 Mar 2019 18:20:37 +0000 (UTC) In-Reply-To: <20190327181628.15899-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin , David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org, Sean Paul List-Id: dri-devel@lists.freedesktop.org RnJvbTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CgpbIFVwc3RyZWFt IGNvbW1pdCAyMjdhZDZkOTU3ODk4YTg4YjE3NDZlMzAyMzRlY2U2NGQzMDVmMDY2IF0KCkRlbGF5 IHRoZSBkcm1fbW9kZXNldF9hY3F1aXJlX2luaXQoKSB1bnRpbCBhZnRlciB3ZSBjaGVjayBmb3Ig YW4KYWxsb2NhdGlvbiBmYWlsdXJlIHNvIHRoYXQgd2UgY2FuIHJldHVybiBpbW1lZGlhdGVseSB1 cG9uIGVycm9yIHdpdGhvdXQKaGF2aW5nIHRvIHVud2luZC4KCldBUk5JTkc6IGxvY2sgaGVsZCB3 aGVuIHJldHVybmluZyB0byB1c2VyIHNwYWNlIQo0LjIwLjArICMxNzQgTm90IHRhaW50ZWQKLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCnN5ei1leGVjdXRv cjU1Ni84MTUzIGlzIGxlYXZpbmcgdGhlIGtlcm5lbCB3aXRoIGxvY2tzIHN0aWxsIGhlbGQhCjEg bG9jayBoZWxkIGJ5IHN5ei1leGVjdXRvcjU1Ni84MTUzOgogICMwOiAwMDAwMDAwMDUxMDBjODVj IChjcnRjX3d3X2NsYXNzX2FjcXVpcmUpeysuKy59LCBhdDoKc2V0X3Byb3BlcnR5X2F0b21pYysw eGIzLzB4MzMwIGRyaXZlcnMvZ3B1L2RybS9kcm1fbW9kZV9vYmplY3QuYzo0NjIKClJlcG9ydGVk LWJ5OiBzeXpib3QrNmVhMzM3YzQyN2Y1MDgzZWJkZjJAc3l6a2FsbGVyLmFwcHNwb3RtYWlsLmNv bQpGaXhlczogMTQ0YTc5OTlkNjMzICgiZHJtOiBIYW5kbGUgcHJvcGVydGllcyBpbiB0aGUgY29y ZSBmb3IgYXRvbWljIGRyaXZlcnMiKQpTaWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlz QGNocmlzLXdpbHNvbi5jby51az4KQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3 bGwuY2g+CkNjOiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50 ZWwuY29tPgpDYzogU2VhbiBQYXVsIDxzZWFuQHBvb3JseS5ydW4+CkNjOiBEYXZpZCBBaXJsaWUg PGFpcmxpZWRAbGludXguaWU+CkNjOiA8c3RhYmxlQHZnZXIua2VybmVsLm9yZz4gIyB2NC4xNCsK UmV2aWV3ZWQtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5p bnRlbC5jb20+Ckxpbms6IGh0dHBzOi8vcGF0Y2h3b3JrLmZyZWVkZXNrdG9wLm9yZy9wYXRjaC9t c2dpZC8yMDE4MTIzMDEyMjg0Mi4yMTkxNy0xLWNocmlzQGNocmlzLXdpbHNvbi5jby51awoKU2ln bmVkLW9mZi1ieTogU2FzaGEgTGV2aW4gPHNhc2hhbEBrZXJuZWwub3JnPgotLS0KIGRyaXZlcnMv Z3B1L2RybS9kcm1fbW9kZV9vYmplY3QuYyB8IDEgKwogMSBmaWxlIGNoYW5nZWQsIDEgaW5zZXJ0 aW9uKCspCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9tb2RlX29iamVjdC5jIGIv ZHJpdmVycy9ncHUvZHJtL2RybV9tb2RlX29iamVjdC5jCmluZGV4IDEwNTU1MzM3OTJmMy4uZWJi Y2NjZmQ4NDI4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX21vZGVfb2JqZWN0LmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9tb2RlX29iamVjdC5jCkBAIC00MzgsNiArNDM4LDcg QEAgc3RhdGljIGludCBzZXRfcHJvcGVydHlfYXRvbWljKHN0cnVjdCBkcm1fbW9kZV9vYmplY3Qg Km9iaiwKIAlpZiAoIXN0YXRlKQogCQlyZXR1cm4gLUVOT01FTTsKIAlzdGF0ZS0+YWNxdWlyZV9j dHggPSAmY3R4OworCiByZXRyeToKIAlpZiAocHJvcCA9PSBzdGF0ZS0+ZGV2LT5tb2RlX2NvbmZp Zy5kcG1zX3Byb3BlcnR5KSB7CiAJCWlmIChvYmotPnR5cGUgIT0gRFJNX01PREVfT0JKRUNUX0NP Tk5FQ1RPUikgewotLSAKMi4xOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9kcmktZGV2ZWw= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 075E2C10F00 for ; Wed, 27 Mar 2019 18:45:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D0851205C9 for ; Wed, 27 Mar 2019 18:45:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553712357; bh=nuD/PVs0Ei4XkV8Iup9ZJfxrf+Y6eSh6Y9hnGgqefjs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=QXWw+1jOsz5pBU3DbeO4g+JACICF7yuVbtefECDq6OXnC2t3zKhtSUkmgwEiz8BBu 36YMwQLTA5Uqdfh8p4tXQrVirawGNUIpylsXien1BIOQ7tLhgC3kSDYGcGwBDHHMoE ByclCsiXCPujKbWu0yfb6xRDI94NmcVN84yVJgZI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390990AbfC0SUk (ORCPT ); Wed, 27 Mar 2019 14:20:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:38250 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390968AbfC0SUi (ORCPT ); Wed, 27 Mar 2019 14:20:38 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3D6382063F; Wed, 27 Mar 2019 18:20:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553710837; bh=nuD/PVs0Ei4XkV8Iup9ZJfxrf+Y6eSh6Y9hnGgqefjs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c89tagQM8NV0EMxxSQAI47ptbHueR+XNeV6uAwrXauTD4NdfNBzzJRuNfQ3e7Yyu0 cAm8FBMwskNqgR/lRjHhdjkZeeWUllDziF9TFw341dkfv4S9Y0RzxZnN0k0y5MYyHA hPfmQez5m3i0CS5Q+9D65h1A7AEFVByNsJWYZPFA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chris Wilson , Daniel Vetter , Maarten Lankhorst , Sean Paul , David Airlie , Sasha Levin , dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.14 121/123] drm: Reorder set_property_atomic to avoid returning with an active ww_ctx Date: Wed, 27 Mar 2019 14:16:25 -0400 Message-Id: <20190327181628.15899-121-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190327181628.15899-1-sashal@kernel.org> References: <20190327181628.15899-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chris Wilson [ Upstream commit 227ad6d957898a88b1746e30234ece64d305f066 ] Delay the drm_modeset_acquire_init() until after we check for an allocation failure so that we can return immediately upon error without having to unwind. WARNING: lock held when returning to user space! 4.20.0+ #174 Not tainted ------------------------------------------------ syz-executor556/8153 is leaving the kernel with locks still held! 1 lock held by syz-executor556/8153: #0: 000000005100c85c (crtc_ww_class_acquire){+.+.}, at: set_property_atomic+0xb3/0x330 drivers/gpu/drm/drm_mode_object.c:462 Reported-by: syzbot+6ea337c427f5083ebdf2@syzkaller.appspotmail.com Fixes: 144a7999d633 ("drm: Handle properties in the core for atomic drivers") Signed-off-by: Chris Wilson Cc: Daniel Vetter Cc: Maarten Lankhorst Cc: Sean Paul Cc: David Airlie Cc: # v4.14+ Reviewed-by: Maarten Lankhorst Link: https://patchwork.freedesktop.org/patch/msgid/20181230122842.21917-1-chris@chris-wilson.co.uk Signed-off-by: Sasha Levin --- drivers/gpu/drm/drm_mode_object.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/drm_mode_object.c b/drivers/gpu/drm/drm_mode_object.c index 1055533792f3..ebbcccfd8428 100644 --- a/drivers/gpu/drm/drm_mode_object.c +++ b/drivers/gpu/drm/drm_mode_object.c @@ -438,6 +438,7 @@ static int set_property_atomic(struct drm_mode_object *obj, if (!state) return -ENOMEM; state->acquire_ctx = &ctx; + retry: if (prop == state->dev->mode_config.dpms_property) { if (obj->type != DRM_MODE_OBJECT_CONNECTOR) { -- 2.19.1