From patchwork Mon Oct 24 11:29:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9480 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp480622wru; Mon, 24 Oct 2022 07:21:21 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5Cqmf92/tId/sDlVaWHo1qmIewxWI+aftVbSHXXLyUUHih5sGLWuIyktgZxfYygFW5YJnB X-Received: by 2002:a17:907:1624:b0:78d:d61c:2b4a with SMTP id hb36-20020a170907162400b0078dd61c2b4amr27651226ejc.208.1666621280952; Mon, 24 Oct 2022 07:21:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666621280; cv=none; d=google.com; s=arc-20160816; b=dHDSj/kSeMYTByx6gyEdGTr+gj1gqFTWJvC7HLnaxMm9zP8h/TRJFgsyJZyzirSNsE 0wIdVrUe0t2Ikei/Z9XnYU5k+C3yYMAMfuKQCzMRAsk0HzjccLBOoMD4q2ivpDIpKKHg CbAabJgfAvlqb4fUJ4sLRVZsRG3Jfgxmr7hW+XWRkL7eG5A56VIG4Y3Gg1u14tm3IJRS oUFzANCWahfT+ytS7Iwn0AI4PrCQyGO2rw1FbvjBo9xX8TRHj33PZSbkTFlWVbStEoUy ZMFf7jjCM9dEnCYMPHhyA7XSBbdtfGSAhTcf1sOeHre3J/AM0BcHuZZ1p4lVT/fln9Wt ylkw== 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=+MXc/a5oFlvsgTc572ro7Oq3bWVBVE0/rriL/owB27s=; b=tD27ejUrfks+2RwvSMJL0CiY10WqewUO7h9k83Vd/EidaTy3kYlcYXJCnEyxHsLILA k7mF4Fo+adOh/1jH9+5a1QKUkUKjWszIyLLzDa5drN1okn9PdotRcuoa+QBRQgdqisKV +2uNH+PD3E8QiPf04QyZ9xPxLi+Pl75r4Br4XLkkhosPMVPrS/goP65X4UQIcdfxzmOX sNsqUQwdmCbjko4UtSehfEUcy9RqfjWY/RZH2xzm2hedeofmdjwHUyMRu8O9TN+E+XbU VTIJ5I52NKjm1T5yD8BksSCkt5+0NtzKnXuhFRyGSQoGBPU7wTDoDneMAfnWcj2joQOq xeiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=WwjQu7C+; 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 c14-20020a05640227ce00b0045bd55b122csi31603225ede.332.2022.10.24.07.20.55; Mon, 24 Oct 2022 07:21: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=WwjQu7C+; 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 S235099AbiJXOSj (ORCPT + 99 others); Mon, 24 Oct 2022 10:18:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36706 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234491AbiJXOOB (ORCPT ); Mon, 24 Oct 2022 10:14:01 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C65DDCBFD0; Mon, 24 Oct 2022 05:54:00 -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 9638761299; Mon, 24 Oct 2022 12:42:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A864DC433D6; Mon, 24 Oct 2022 12:42:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615377; bh=OzLtw84/qExOO0VigNtqfN9GRq/sTIKWBf6EPPnoyMA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WwjQu7C+2BhRXVlKLm7XGJ7Gh9ORMakuuFUwy38x/NRCfMz6gY+Aml6mS3UfBf62K wAAtNY4Hh3MuIf6aquwKe+J79mkpiIF+EXHOrFnUjDgqrlHJVFS+3khl0hR//oqaOy VYqqq3ZFOSbjotqcQcSBy/oo7kLkMTlKt0ki+4fo= 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 5.15 226/530] drm/bridge: megachips: Fix a null pointer dereference bug Date: Mon, 24 Oct 2022 13:29:30 +0200 Message-Id: <20221024113055.322043908@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@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?1747579076250784087?= X-GMAIL-MSGID: =?utf-8?q?1747579076250784087?= 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 cce98bf2a4e7..72248a565579 100644 --- a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c +++ b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c @@ -296,7 +296,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);