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 4A4F1C43381 for ; Wed, 27 Mar 2019 19:13:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1B4F12064A for ; Wed, 27 Mar 2019 19:13:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553714004; bh=AwNqZ837H+sTkz985OPXvZ7d55Tmz88sdkP+w0FuKeM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lK8I/riCVtR+0SqBnXW0L3FPHGzJbNyjGDVpI49wwW3C1kMCfupeJQow4rA7e9bkB mttbJI2l/QYHcq2ljWbaRjWegrf9YJHHPG31XrDZ4Ua1ISdYeW9/ZNk8aogOnIPcrm yPh2Hbp7Tunc1xLvLi/XJfrwe0O+2te3/4pvTY0I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387567AbfC0TNR (ORCPT ); Wed, 27 Mar 2019 15:13:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:52222 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388761AbfC0SKP (ORCPT ); Wed, 27 Mar 2019 14:10:15 -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 05DA72186A; Wed, 27 Mar 2019 18:10:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553710215; bh=AwNqZ837H+sTkz985OPXvZ7d55Tmz88sdkP+w0FuKeM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U/t8dPdoNFqGrbnp8lUF7XrbF62bJvdqqTw4yZi2NYWChyVv5CmaSmXf+JzLRKoC/ 2HMyGwziHtlfXwF0Ldf1zSh11rwaU/Ke6EAAeTyQidMqQnOSsBInMr6eSHJwsYxegi NEZu/PvuTj92m3Dh3CBjWJQwJ7CZCc8tLFscRzaQ= 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 5.0 256/262] drm: Reorder set_property_atomic to avoid returning with an active ww_ctx Date: Wed, 27 Mar 2019 14:01:51 -0400 Message-Id: <20190327180158.10245-256-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190327180158.10245-1-sashal@kernel.org> References: <20190327180158.10245-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 004191d01772..15b919f90c5a 100644 --- a/drivers/gpu/drm/drm_mode_object.c +++ b/drivers/gpu/drm/drm_mode_object.c @@ -465,6 +465,7 @@ static int set_property_atomic(struct drm_mode_object *obj, drm_modeset_acquire_init(&ctx, 0); state->acquire_ctx = &ctx; + retry: if (prop == state->dev->mode_config.dpms_property) { if (obj->type != DRM_MODE_OBJECT_CONNECTOR) { -- 2.19.1