Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp4417157pxa; Mon, 10 Aug 2020 08:36:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxB6kD2o6dDVa4HQJEyxD6P4P8qQLGwPR7kS7LnPimn1wmqY+XDouce91N0MqEj7jJ1CVBO X-Received: by 2002:a17:906:401b:: with SMTP id v27mr21936902ejj.300.1597073771290; Mon, 10 Aug 2020 08:36:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597073771; cv=none; d=google.com; s=arc-20160816; b=uLofjvkkvDn9y0mYAfTmAGckJh0gWnhmAp/+qcoetEjjNDPhGaQUkhs3PF2DELSQE/ +OKgiVN6rfyVkXO0bw6Uk0w4IT4DflJNTZ3BQDQIPH8J7oBfi2VSMr9jfVmRdg/eFHA8 QkqvOF1bDo7Igg1tzeSQu50mEz+N785W8VjSF6GWKaGco4HQVOtdtvNDyFBlTTxP8248 QYND2Cuq9Q3FoEwaNCdgMhzUsrUlfLP6P4WRCrA6UPbIauGX8W0UqdpMF672kDdkAV4r v4UcXfX0CqDiYd+Y6Tt11GLXSIWe+6KnoAZQ7Vd/25QVuF2URvQwkXCL8LS+G35Z5AAt 8Lkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=FwL43guFV80W15gQlGCY9bb2Lej+IggLv3/HZENq8gk=; b=Umx/BUS4SP7yEQXFc8K7exR4OysjXAuneh1o0S6tPV/SFbZLQdkpqlFj7B0HO63ofG eWGcbKlLY0Em9V33grQkDc9MxvRJ6wGjUXTixeq0szaflntVAN70ARqfsSZyhOl/TbWG iYlLPZp1jD97WItwGx++IjRODd654oo7Nyfw39MySvko8sCGNK/nTTeEN6ceBvsz9VmN efYVRNQhllorpzWSaxJwuOpCZnAE4X2iZkbFoPq8sQWw3hqAKmodRucvBhd6hYWaTqKy Hiug4MWJBMGAK06N0APTcuMqOsZTgtIa3Z1LlOaz++WWY7xUv7cZZHerDEkC2Wc8rk89 RKbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=yH9ISboa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o3si10767290ejm.346.2020.08.10.08.35.47; Mon, 10 Aug 2020 08:36:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=yH9ISboa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728773AbgHJPdc (ORCPT + 99 others); Mon, 10 Aug 2020 11:33:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:36354 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728767AbgHJP3s (ORCPT ); Mon, 10 Aug 2020 11:29:48 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8EDB122B47; Mon, 10 Aug 2020 15:29:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597073388; bh=7TiK53xFoSKriDUpsjT7QaIg562K5VM1xyvhfBtoysI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yH9ISboadDNVaByQr+Bbokhko1rDDRLUpialVgzYZ+jx3av2ttaCKGMfqHNTNZdzI ezvWTQ616gP8g6Y3LkjfdpdT5XWO1dQ0wYi9D5dlaElLVy5W1Jhriv6r6izGMYUlaC iVRR+Eh5c+lxoRoZScDCIBiGeJ2Tb8FWajonIY0E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ben Skeggs , Sasha Levin Subject: [PATCH 4.19 20/48] drm/nouveau/fbcon: fix module unload when fbcon init has failed for some reason Date: Mon, 10 Aug 2020 17:21:42 +0200 Message-Id: <20200810151805.207630766@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200810151804.199494191@linuxfoundation.org> References: <20200810151804.199494191@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ben Skeggs [ Upstream commit 498595abf5bd51f0ae074cec565d888778ea558f ] Stale pointer was tripping up the unload path. Signed-off-by: Ben Skeggs Signed-off-by: Sasha Levin --- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c index 0f64c0a1d4b30..fef38ea146a2a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c @@ -599,6 +599,7 @@ fini: drm_fb_helper_fini(&fbcon->helper); free: kfree(fbcon); + drm->fbcon = NULL; return ret; } -- 2.25.1