From patchwork Mon Oct 24 11:30:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8724 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp423578wru; Mon, 24 Oct 2022 05:25:20 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6QDNOJWeoomtavTjsUgqdRX1jRcHuNxbdY3WE4p41MASXaCHYhenKl0PF5Ko3egMEPaSKw X-Received: by 2002:a05:6402:24a0:b0:454:d197:6238 with SMTP id q32-20020a05640224a000b00454d1976238mr29831782eda.274.1666614320385; Mon, 24 Oct 2022 05:25:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666614320; cv=none; d=google.com; s=arc-20160816; b=jPQHlDPtPNXZh7ks41xNoxAUbEeWPLfYupRahqwciBo4Iv79TD6OTjfy69nU1QRjWP g+LLsJti4YZ6Jw/y/WDzvmlV5N3ME9iUfD582AauGCyrP3dHWv2s8GXw61ynlRpQtjIk RdbH6BuM5p0cth8QXXzZiLufyf5kAq+qLOTeE0qLkLH7TAsUmDGF1eVWS+oU617h5j0d gR1YvSKS2tDfb09j++FFT/IUtO1yYXT/5DOjhH52e6ipEBzQpO+OaqjVXag+LOiiT8Ri bydCD1LC1WgNEAd9Aszs37BHg3DjHBrAU6DhfSF7mV27mbzbs69NP6nWLbFtv3kf8+XF hxPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Pkqvgejxg5VVprw4Xrj/kzoXnGTOj9c1aM4fmwXTSQk=; b=YeFwfNtHXDDbBYdYUxJD82t1jGqJdcdyBkv+/KptLWjotXoKDz3wzpQVFmpdD3OQjo fIVs6zTcuJ6jip08MgBUvSIuRIl3DlSowbPkvxwpzvzdQW6Mf8rPiUv0WBX7yzmjagKL IMR0lSlUMqKZ1nQvWn1/fb+C+MZ+8EAOp3feKbGQFs8bTdQtUMtXxJF1/sAqRNsANqf3 UOsNqLG2Ih12cfgXQDxVzpu2MYGcjQiU4+lafYiGrAbimUXQYsBcxi6m4sUrdeLMxHN2 Fwi+iNdPiyrLEHS85/tAzYkwnAtdK6+ckNJzsLWAyzgDWJWnwfzMaqezUQkPlfSuWRea 72QQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=cp+iRDid; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id wz8-20020a170906fe4800b007aa493b067asi1085523ejb.396.2022.10.24.05.24.55; Mon, 24 Oct 2022 05:25:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=cp+iRDid; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233615AbiJXMXz (ORCPT + 99 others); Mon, 24 Oct 2022 08:23:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47380 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233526AbiJXMWm (ORCPT ); Mon, 24 Oct 2022 08:22:42 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CCB2CBE21; Mon, 24 Oct 2022 04:59:27 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 733D961254; Mon, 24 Oct 2022 11:58:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 600FDC433C1; Mon, 24 Oct 2022 11:58:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612732; bh=4ml/Nor2Q9RjHra/6MNu/PCwtzXeRuoO3McV+6kBME8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cp+iRDidWQPL/ORTqy8U4gr2Y9nKl1Lt+sr0I0nxPNDlm7d10Qep6l5ieErK+H5xX lL9DYhjXzc9hWh1XRyIUulT2wwSEaH8VOT3nngZ3jt5pbYPfbjJAAUlpAcf1HRQLUO eXHnm2v5Ps3rhHLeN93+Y5fMkYyeCMiwY29f58A8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Zheyu Ma , Robert Foss , Sasha Levin Subject: [PATCH 4.19 099/229] drm/bridge: megachips: Fix a null pointer dereference bug Date: Mon, 24 Oct 2022 13:30:18 +0200 Message-Id: <20221024113002.235458834@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112959.085534368@linuxfoundation.org> References: <20221024112959.085534368@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747571777787383883?= X-GMAIL-MSGID: =?utf-8?q?1747571777787383883?= From: Zheyu Ma [ Upstream commit 1ff673333d46d2c1b053ebd0c1c7c7c79e36943e ] When removing the module we will get the following warning: [ 31.911505] i2c-core: driver [stdp2690-ge-b850v3-fw] unregistered [ 31.912484] general protection fault, probably for non-canonical address 0xdffffc0000000001: 0000 [#1] PREEMPT SMP KASAN PTI [ 31.913338] KASAN: null-ptr-deref in range [0x0000000000000008-0x000000000000000f] [ 31.915280] RIP: 0010:drm_bridge_remove+0x97/0x130 [ 31.921825] Call Trace: [ 31.922533] stdp4028_ge_b850v3_fw_remove+0x34/0x60 [megachips_stdpxxxx_ge_b850v3_fw] [ 31.923139] i2c_device_remove+0x181/0x1f0 The two bridges (stdp2690, stdp4028) do not probe at the same time, so the driver does not call ge_b850v3_resgiter() when probing, causing the driver to try to remove the object that has not been initialized. Fix this by checking whether both the bridges are probed. Fixes: 11632d4aa2b3 ("drm/bridge: megachips: Ensure both bridges are probed before registration") Signed-off-by: Zheyu Ma Signed-off-by: Robert Foss Link: https://patchwork.freedesktop.org/patch/msgid/20220830073450.1897020-1-zheyuma97@gmail.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c index a8d776edccc1..07e3a8aaa0e4 100644 --- a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c +++ b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c @@ -290,7 +290,9 @@ static void ge_b850v3_lvds_remove(void) * This check is to avoid both the drivers * removing the bridge in their remove() function */ - if (!ge_b850v3_lvds_ptr) + if (!ge_b850v3_lvds_ptr || + !ge_b850v3_lvds_ptr->stdp2690_i2c || + !ge_b850v3_lvds_ptr->stdp4028_i2c) goto out; drm_bridge_remove(&ge_b850v3_lvds_ptr->bridge);