Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp1782867imm; Thu, 27 Sep 2018 02:23:50 -0700 (PDT) X-Google-Smtp-Source: ACcGV61Oi8kou1V/E/UTHeKCRGx27y96f/7tM7z0azyXRt+Dr3Sk/0+zX/91GYVBRB8WhmOpa5En X-Received: by 2002:a63:1f0a:: with SMTP id f10-v6mr9224680pgf.313.1538040230615; Thu, 27 Sep 2018 02:23:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538040230; cv=none; d=google.com; s=arc-20160816; b=M+4IgrhvQNEJ4PSX5H6Fa46urpbquG3pZplgf/jPwYnmDu9HeNLB8agg7wSCkMKmHI sqsKmjxOGvtFlZLnQjJlLwBoDRIN0tVf2Et/1JbVmG8JjmbP3twkux59ccfmU0fOrCX4 GlUcF2dub1YRJjXnqKcQLi6JPgL68agUzuTplIkzD/GOi8hD4KPG0QAL9aDBptAfWU3u S0taz9AaG9+IBEkTjnBCk1PRYW3DpYsXUOlXMKNOGDdjbzo1Q9n0tQ7l98E5gblLo7dj 9LLWbW5eRjBlF30cG6DmUIbxSi2U3IFz4gsMUGc8q03MzlIvucl7JMuRbm3OelaGHHXS 867A== 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; bh=Gen2jW5eZ5LjVRC72BKqOIlBbwOo5Nlzv9YRPQEOhbc=; b=GHMm9EaxR/855hxVpAkeVxk5Ds/KeqfcdIYEWMn4fLa/AGo2pufV7BS/5lk9PDTETQ PK9LSazbbDw12pNEugQiPj24EIov5i8oagaZ4nPXfsLsv96XRkJ71dIHlqKDvaKQAdgH SiTk1cYtPnfo6kb+6Ed/4cnp3pl2U+kUxO0/vo1qyRKYD9S8CeEJuQwy4XpDq+AHf70f 9OsrgRwxtWpPPIvds1xcNssKwgXzQt8LosACO5tpbwCtzMU/blK0wB5EhLk+uLERadeq Mfaf0kR6YhPznuKF4VcFvZbQ/z0ArubA8v8JBvbq7KctD4etpXf0wSUe9/+Y4x+2S673 rKrg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ca2-v6si1681741plb.480.2018.09.27.02.23.35; Thu, 27 Sep 2018 02:23:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727534AbeI0Pjc (ORCPT + 99 others); Thu, 27 Sep 2018 11:39:32 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:56352 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727057AbeI0Pjc (ORCPT ); Thu, 27 Sep 2018 11:39:32 -0400 Received: from localhost (ip-213-127-77-73.ip.prioritytelecom.net [213.127.77.73]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id E75D21120; Thu, 27 Sep 2018 09:22:12 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sean Paul , Daniel Vetter , Emil Lundmark Subject: [PATCH 4.14 47/64] drm: udl: Destroy framebuffer only if it was initialized Date: Thu, 27 Sep 2018 11:04:04 +0200 Message-Id: <20180927090256.569191069@linuxfoundation.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20180927090249.801943776@linuxfoundation.org> References: <20180927090249.801943776@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review 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 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Emil Lundmark commit fcb74da1eb8edd3a4ef9b9724f88ed709d684227 upstream. This fixes a NULL pointer dereference that can happen if the UDL driver is unloaded before the framebuffer is initialized. This can happen e.g. if the USB device is unplugged right after it was plugged in. As explained by Stéphane Marchesin: It happens when fbdev is disabled (which is the case for Chrome OS). Even though intialization of the fbdev part is optional (it's done in udlfb_create which is the callback for fb_probe()), the teardown isn't optional (udl_driver_unload -> udl_fbdev_cleanup -> udl_fbdev_destroy). Note that udl_fbdev_cleanup *tries* to be conditional (you can see it does if (!udl->fbdev)) but that doesn't work, because udl->fbdev is always set during udl_fbdev_init. Cc: stable@vger.kernel.org Suggested-by: Sean Paul Reviewed-by: Sean Paul Acked-by: Daniel Vetter Signed-off-by: Emil Lundmark Signed-off-by: Sean Paul Link: https://patchwork.freedesktop.org/patch/msgid/20180528142711.142466-1-lndmrk@chromium.org Signed-off-by: Sean Paul Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/udl/udl_fb.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) --- a/drivers/gpu/drm/udl/udl_fb.c +++ b/drivers/gpu/drm/udl/udl_fb.c @@ -432,9 +432,11 @@ static void udl_fbdev_destroy(struct drm { drm_fb_helper_unregister_fbi(&ufbdev->helper); drm_fb_helper_fini(&ufbdev->helper); - drm_framebuffer_unregister_private(&ufbdev->ufb.base); - drm_framebuffer_cleanup(&ufbdev->ufb.base); - drm_gem_object_put_unlocked(&ufbdev->ufb.obj->base); + if (ufbdev->ufb.obj) { + drm_framebuffer_unregister_private(&ufbdev->ufb.base); + drm_framebuffer_cleanup(&ufbdev->ufb.base); + drm_gem_object_put_unlocked(&ufbdev->ufb.obj->base); + } } int udl_fbdev_init(struct drm_device *dev)