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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 22BACC433F5 for ; Wed, 4 May 2022 18:01:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1359471AbiEDSEn (ORCPT ); Wed, 4 May 2022 14:04:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41832 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1376518AbiEDSES (ORCPT ); Wed, 4 May 2022 14:04:18 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id AE75F4EF41 for ; Wed, 4 May 2022 10:18:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1651684737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3t8epFEjcxVGinupv1KfUngZ1NH7mCjOSa22VqDXFR0=; b=X1+4HlfZBhTqWCgP1r5i8asWa5k/8KZqFkILiwIgoa/ebK0fILBDn1kv2Q+C+UexoTywc6 FBnzZpoeCmKvxJAGs3b46jz3mnI4xhrpKPeTL61tszjksPi2yodu0urO3g+YI27F+F/3Sa AyKObawJMjlCsttouj9uXen+WzX3vDo= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-119-Ery-n5ncOS6qLJNL6PCdeg-1; Wed, 04 May 2022 13:18:56 -0400 X-MC-Unique: Ery-n5ncOS6qLJNL6PCdeg-1 Received: by mail-ej1-f69.google.com with SMTP id gn26-20020a1709070d1a00b006f453043956so1209023ejc.15 for ; Wed, 04 May 2022 10:18:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=3t8epFEjcxVGinupv1KfUngZ1NH7mCjOSa22VqDXFR0=; b=vcWZ5HrvDbgzP69BRJqW++r7DOcU68uBxW6KAW/eAg20HYnt+quCywh+j7kNT/XuyB d1wRkVbqdbGFDduAiOV88lttTO6UKNT5qD2yvER79jmZ6x53+QNQynoHXufCxaImt7UX bZYPb8/ynX/gWPiVszC6Ooq713OcQQc/pxoiPBhzbI53QZbp2l/aR2McqntZohdRCFKK 1ZvwJ8u/83FtG6J+HobriEtxlMP+HgaWP/BUdKKG+r2l9TKTo0WuTKvvBGu3aO8GULVt tTocvscLxdwyiA5axSV9gjEMwsw32iMVxBx2zsfH2WdYSqsM93+4ehbhhz/AU+MvOWu/ jz6w== X-Gm-Message-State: AOAM530TOdUyag62rM49PThbWSN36HqmskMSozpvxJwJhWvfci4vAwEA BrYrJ+igIxP1VJLr200GoYjf4lRlef4pkvObI7eItcFyBB+UfO2H8nnXwQahkKJly+Y1XCSGij2 1IoGh32f+fbgHUae/YlkpOg540gd2+5IsFA7hzA4bfSfCV06LZ4CwA1xQFlejisF83aVoAczpoD dm X-Received: by 2002:a17:907:a407:b0:6f4:3f14:7707 with SMTP id sg7-20020a170907a40700b006f43f147707mr16222527ejc.351.1651684735025; Wed, 04 May 2022 10:18:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxeNLSEO6aMZEJmeSDZvOrdtsRQbX4QDRaEAbooQf77kraL3riqlGTEh69XjibmoSyspABsDQ== X-Received: by 2002:a17:907:a407:b0:6f4:3f14:7707 with SMTP id sg7-20020a170907a40700b006f43f147707mr16222496ejc.351.1651684734772; Wed, 04 May 2022 10:18:54 -0700 (PDT) Received: from fedora.nat2.vcit.vutbr.net (nat2.vcit.vutbr.net. [185.62.108.68]) by smtp.gmail.com with ESMTPSA id bf16-20020a0564021a5000b0042617ba63aesm9492598edb.56.2022.05.04.10.18.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 May 2022 10:18:54 -0700 (PDT) From: Mark Menzynski To: linux-kernel@vger.kernel.org Cc: Mark Menzynski , Ben Skeggs , Karol Herbst , Lyude Paul , David Airlie , Daniel Vetter , Sumit Semwal , =?UTF-8?q?Christian=20K=C3=B6nig?= , dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org Subject: [PATCH] drm/nouveau: reorder nouveau_drm_device_fini Date: Wed, 4 May 2022 19:18:51 +0200 Message-Id: <20220504171851.17188-1-mmenzyns@redhat.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Resources needed for output poll workers are destroyed in nouveau_fbcon_fini() before output poll workers are cleared in nouveau_display_fini(). This means there is a time between fbcon_fini and display_fini, where if output poll happens, it crashes. BUG: KASAN: use-after-free in __drm_fb_helper_initial_config_and_unlock.cold+0x1f3/0x291 [drm_kms_helper] Cc: Ben Skeggs Cc: Karol Herbst Cc: Lyude Paul Cc: David Airlie Cc: Daniel Vetter Cc: Sumit Semwal Cc: "Christian König" Cc: dri-devel@lists.freedesktop.org Cc: nouveau@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org Cc: linux-media@vger.kernel.org Cc: linaro-mm-sig@lists.linaro.org Signed-off-by: Mark Menzynski --- drivers/gpu/drm/nouveau/nouveau_drm.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 561309d447e0..773efdd20d2f 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -588,12 +588,6 @@ nouveau_drm_device_init(struct drm_device *dev) if (ret) goto fail_dispctor; - if (dev->mode_config.num_crtc) { - ret = nouveau_display_init(dev, false, false); - if (ret) - goto fail_dispinit; - } - nouveau_debugfs_init(drm); nouveau_hwmon_init(dev); nouveau_svm_init(drm); @@ -601,6 +595,12 @@ nouveau_drm_device_init(struct drm_device *dev) nouveau_fbcon_init(dev); nouveau_led_init(dev); + if (dev->mode_config.num_crtc) { + ret = nouveau_display_init(dev, false, false); + if (ret) + goto fail_dispinit; + } + if (nouveau_pmops_runtime()) { pm_runtime_use_autosuspend(dev->dev); pm_runtime_set_autosuspend_delay(dev->dev, 5000); @@ -641,15 +641,14 @@ nouveau_drm_device_fini(struct drm_device *dev) pm_runtime_forbid(dev->dev); } + if (dev->mode_config.num_crtc) + nouveau_display_fini(dev, false, false); nouveau_led_fini(dev); nouveau_fbcon_fini(dev); nouveau_dmem_fini(drm); nouveau_svm_fini(drm); nouveau_hwmon_fini(dev); nouveau_debugfs_fini(drm); - - if (dev->mode_config.num_crtc) - nouveau_display_fini(dev, false, false); nouveau_display_destroy(dev); nouveau_accel_fini(drm); -- 2.32.0