From patchwork Mon Aug 10 15:21:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 266637 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=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, 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 1D8B8C433DF for ; Mon, 10 Aug 2020 15:36:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F1E412310C for ; Mon, 10 Aug 2020 15:36:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597073807; bh=P00ThBgQLNlRPDK/22PRWiBmRKyKzX5ABwnqAtmOvHM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LTdqzUPQ+v8TwcRlezjFW+/049bVxFzlqskQAOaFx4m5C50RXd38A0Dx4jeHqmCwD znZCEz91fCR8WoNhtD28XczdTSfUo88l5NMtJv6h+kBqlUh8AXxEIortNwvBBCpCZ1 RJEl/V3GGqrFdTchZWdndbRWVFqWCmt7twd2ZGiM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728719AbgHJP1S (ORCPT ); Mon, 10 Aug 2020 11:27:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:33006 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728410AbgHJP1L (ORCPT ); Mon, 10 Aug 2020 11:27:11 -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 3E2AF22B47; Mon, 10 Aug 2020 15:27:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597073229; bh=P00ThBgQLNlRPDK/22PRWiBmRKyKzX5ABwnqAtmOvHM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qjdNvqzsijnmthjP2OeytCBsH271RVXGSYwyHZgL/XH3NcR8FF4hXbh+TNnvq9VOt DTU+fYnWcDl0FIeCI1jASsO7KUyDPJ3isC8nBPgWMqa/pJLnn9TmWLQ0I+ecZZzQP2 WILw5jm8N9/7/GebWxkv2COknqxgjJNTuepxPZFw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ben Skeggs , Sasha Levin Subject: [PATCH 5.4 32/67] drm/nouveau/fbcon: fix module unload when fbcon init has failed for some reason Date: Mon, 10 Aug 2020 17:21:19 +0200 Message-Id: <20200810151811.014203848@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200810151809.438685785@linuxfoundation.org> References: <20200810151809.438685785@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 f439f0a5b43a5..141cc89981240 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c @@ -592,6 +592,7 @@ fini: drm_fb_helper_fini(&fbcon->helper); free: kfree(fbcon); + drm->fbcon = NULL; return ret; }