From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 28C62CA6015 for ; Fri, 9 Oct 2026 06:18:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=hCBOiXS5E+sjBLXQS1qqOE3Kq9A4BSGhjRdnaHeC9aE=; b=OQj9bzUbQS4M4I6UBEdAB7E+Zc Lj6qtoP0K8NDPUmXSXZQaX7Pj5zYqdiE9uJQ7N3QU/EABrJ+kc5JCP/WR3QhtxDuHutWW2kmpHjgu q4m9f0PurJdWQxgGdqWAl8+rHghUHxJcohTe2AvIYNTAiN7JI06AqyAUGjSjiug/MLpRMHC2xwntd w2WXfwzLXOsZHcLtCZw6+HtTBeHDNBLd2vRi852SFaVrc6XgL37a8J/nbZigPFCKfFOyVKsdajaea c9DpcBrhkYeF7WRkklek17GA/Nue3K63k4giLQlNehoHY3q/cnpIliJf+z2byiJIrpYUr/jjhfmQf ykHkiK2Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1xF3vn-00000005cCp-2FT7; Fri, 09 Oct 2026 06:18:11 +0000 Received: from smtp81.cstnet.cn ([159.226.251.81] helo=cstnet.cn) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1xF3vk-00000005cBf-1lj7 for linux-arm-kernel@lists.infradead.org; Fri, 09 Oct 2026 06:18:10 +0000 Received: from fc87d0ffb700.home.arpa (unknown [36.110.52.2]) by APP-03 (Coremail) with SMTP id rQCowADHzz0ah8hqltkdCg--.22649S2; Fri, 09 Oct 2026 14:18:03 +0800 (CST) From: Haotian Zhang To: Stephen Boyd , Brian Masney , Jerome Brunet , Michal Simek , Michael Tretter Cc: linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] clk: xilinx: fix NULL pointer dereference in xvcu_clk_hw_unregister_leaf() Date: Fri, 9 Oct 2026 14:18:05 +0800 Message-Id: <20261009061805.3172589-1-vulab@iscas.ac.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: rQCowADHzz0ah8hqltkdCg--.22649S2 X-Coremail-Antispam: 1UD129KBjvJXoW7ZFykGr17tr4fur48Kw45Wrg_yoW8JF4Dp3 WfC34rA34rtF4UJF47tF1aqFyFg3ZxKay8AFyUX3y7Arn5JFWfKa1rJas2gF4UZryxXrya v3y5tF4UuF1rZrJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkvb7Iv0xC_KF4lb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vEx4 A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IE w4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jrv_JF1lYx0Ex4A2jsIE14v26r4UJVWxJr 1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxkF7I0En4kS14v26r126r1D MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr 0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc40Y0x0E wIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JV WxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Gr0_Cr1lIxAI cVC2z280aVCY1x0267AKxVW8Jr0_Cr1UYxBIdaVFxhVjvjDU0xZFpf9x07j0rWrUUUUU= X-Originating-IP: [36.110.52.2] X-CM-SenderInfo: pyxotu46lvutnvoduhdfq/1tbiDAMPA2rIZ8pguwAAsX X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20261008_231808_836277_D284B609 X-CRM114-Status: GOOD ( 10.74 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org xvcu_clk_hw_unregister_leaf() gets the mux with clk_hw_get_parent(divider), which returns NULL when the divider has no parent, and passes it to clk_hw_unregister_mux() without checking it. The following check tests the wrong variable: divider has already been verified to be non-NULL at this point, so "if (!divider) return;" is dead code and a NULL mux is dereferenced, crashing in clk_hw_unregister_mux(). Only unregister the mux when it is non-NULL, and always release the divider. Fixes: 9c789deea206 ("soc: xilinx: vcu: implement clock provider for output clocks") Assisted-by: DeepSeek-V4.1-Flash Signed-off-by: Haotian Zhang --- drivers/clk/xilinx/xlnx_vcu.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/clk/xilinx/xlnx_vcu.c b/drivers/clk/xilinx/xlnx_vcu.c index f14bda375e35..b004c16692d3 100644 --- a/drivers/clk/xilinx/xlnx_vcu.c +++ b/drivers/clk/xilinx/xlnx_vcu.c @@ -516,9 +516,8 @@ static void xvcu_clk_hw_unregister_leaf(struct clk_hw *hw) return; mux = clk_hw_get_parent(divider); - clk_hw_unregister_mux(mux); - if (!divider) - return; + if (mux) + clk_hw_unregister_mux(mux); clk_hw_unregister_divider(divider); } -- 2.25.1