From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7924E516171 for ; Tue, 13 Oct 2026 15:18:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791904730; cv=none; b=Vcbay5ecHwf8aVX3JbA7KZqzWJGKh5C7dNGdLpFggoGKQOI+Q2Q1rU4Ns6/vY7NiHvptH74EAJpJ1pixsP6OkczTtascYZOfXi8JHxcSX0Beg8pw89sAKemQBSY+dzJzgGE05icG9macPuCCQaAXvGvKUV0koR5X2GzjA2sSi2s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791904730; c=relaxed/simple; bh=AMCODax57KqUMy5UTX/GawCV8PmBS5pugefjN97Hi2g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=p9HckplPSH3+hLTRJ0K5LFgpRL1KD6wMn+xMyV2KaafGgWqNzW7PGvOtJQ3x+/CgGHrRGOubpc4PJOY2QiMza0ViJDqJmsxguzVi7DrRFs4TzvAxuTOrX4KHd2zB35SjhsYECQ+pyVroNdfKv6+A9gNscERvds14XhdFtfBYixI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=W757CHfA; arc=none smtp.client-ip=209.85.216.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="W757CHfA" Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-38759bcd877so1888778a91.2 for ; Tue, 13 Oct 2026 08:18:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791904729; x=1792509529; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=FrpJ3R8Qy/E0WIUg4/pXUKmtopn00SRG/AnQSF67mz4=; b=W757CHfAlBFqZamzOwiW/GwwVGauALoJ1eX2fw0nKysVtWL0FFg2BFA0oPKPra1wkb 49zY88OLy8KejN/gazko/cRZ91E8OVzkbq3EG9CK5QcNNtd1bLWpEsQtpCe/VGm4MXmO 6sKp5bQrhuLhXwSflVN7/Fd12loPNJHxP81waWBJXfSK7s8AB5qctmPlKphB3CWbKr+d ZkVX7YnD8MRKNKQmiTZribsOtwbhmCQer+VmP6ef46a8iXSGO69+m06Zm9tY0b4kXidH jGJxBkhdtVFm+++9TRt10xBX1i7vBkuG6XLIWClJ6cboG/2da+Ei2aJt4i5Jmkz2PkAl xWxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791904729; x=1792509529; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=FrpJ3R8Qy/E0WIUg4/pXUKmtopn00SRG/AnQSF67mz4=; b=W28Sr/WViHNkMpS6A0Qi15sear4ChpIAKSL+N11T+KY/jD7mgWhtaW5Kz17ZHkWESL SStMUqZcivzRCGOKhgjOSOHqeNZsq4Mvu2J8DouX416QAyihk9oBwvyHdrQUwhrO51pq 6klGHBF5H9FAI6rC5ZfLb2kIXFjDf2Kz+aE7yBsYrF6SUXJAXKtb+6rQpXW9znJswk2A 8pmiE79GyLIVfHNufdSW6fJ73EDNotY+XYnEmCPRPPZm2tvopSd6itSuVb6vR0+3V2nX nIyh1tcbp3apSzAUqaOXGOUH2NOtzNtPPp91ZZ8ntxFTpf2eLWz2IH9ZNIt5j84aFZ+S DiCg== X-Forwarded-Encrypted: i=1; AKwUvBxzvicYUpdpnODu3bpVxBNi+aKWPZBklILHZH88/CF8jofJwrVL4d+HWjMhPwF5wPYgHw3O1NFCArlP558=@vger.kernel.org X-Gm-Message-State: AFq9FYLM252Ao8zmpCXT9CxpLtYJa390kNWWfU7U+XRbYx7itSKa3zYj /ijU2ZWIXysRkjeKyWpUfOm9dH524NKUE4Tr9IucJbygyc/xInoZELE8 X-Gm-Gg: AYBFou3aDr00O7lkUI0vEbTfcrblvdGbOkDCnhsunkmd4wbUbTYkdzPtwPl9k0hl36r yEdl2TOx4NuH2RNMG0wCyDX9s5b76j6HuvINPAaBAHKIMkEdRDdX5z21z+dEUkwy19aNxOuQrhQ SfwPx/pfDkRadaweqtBEF6bC6Rnd2LVfpwgxlYR5U9wafhfMZI4U/hGCG/V3sY92PiejBGACrF2 ZBKazmvVXxoIekk2KQFDi1t1yvt3WFJTvcMH1DliZIWKyGO96Olak4o8u4U/085yYRMG/HH2yAq OPEOWmlJTfF3j8qLaJYbvCxBYKZHtlYBXPpgkAkMF/uoOE5UZaFv4kdO2ifsbalh8HhsW5/nrai frUeik5214aWT7IbFOxoNCzaFQ2uDL5sm9ZzIF4vWJWDgTr46LzAEqgVUqt+LqkxYeAAs1Ez8I7 iwPq57uHd6s3dxXenqcwVesJD6+PZzotoqn5zACmiXMDnB81RwtdKXcLsFS4K+d1GlZcdef6MJ0 UBfIksKfWic9VFWMZFCAHfWr11K X-Received: by 2002:a17:90a:5184:b0:3ac:17c:6e82 with SMTP id 98e67ed59e1d1-3ac15d46137mr2707843a91.45.1791904728712; Tue, 13 Oct 2026 08:18:48 -0700 (PDT) Received: from buffalo-ssd.taila54753.ts.net ([240b:253:4760:f400:1ebf:ceff:fe7f:5e0b]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-cd3da04596dsm5759888a12.29.2026.10.13.08.18.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2026 08:18:48 -0700 (PDT) From: Akari Tsuyukusa To: Brian Masney , Jerome Brunet , Matthias Brugger , AngeloGioacchino Del Regno , Yassine Oudjana , Richard Cochran Cc: Chen-Yu Tsai , Bartosz Golaszewski , Kees Cook , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20=28The=20Capable=20Hub=29?= , Danilo Krummrich , Nicolas Frattaroli , Bjorn Helgaas , Takashi Sakamoto , Haotian Zhang , Miles Chen , Sam Shih , Daniel Golle , Chun-Jie Chen , Laura Nao , =?UTF-8?q?N=C3=ADcolas=20F=2E=20R=2E=20A=2E=20Prado?= , linux-clk@vger.kernel.org (open list:COMMON CLK FRAMEWORK), linux-kernel@vger.kernel.org (open list), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Mediatek SoC support), linux-mediatek@lists.infradead.org (moderated list:ARM/Mediatek SoC support), Akari Tsuyukusa , stable@vger.kernel.org Subject: [PATCH v2 09/35] clk: mediatek: Fix index in composite clock unwind path Date: Wed, 14 Oct 2026 00:17:08 +0900 Message-ID: <20261013151734.3177690-10-akkun11.open@gmail.com> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261013151734.3177690-1-akkun11.open@gmail.com> References: <20261013151734.3177690-1-akkun11.open@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit When mtk_clk_register_composites() fails to register a clock, it unwinds previously processed entries. The unwind guard incorrectly checks clk_data->hws[mcs->id], which refers to the first descriptor, instead of the current descriptor. This can cause the unwind to skip entries that need unregistering or pass an invalid pointer to mtk_clk_unregister_composite(). Check clk_data->hws[mc->id] instead. Fixes: 3c3ba2ab0226 ("clk: mediatek: mtk: Implement error handling in register APIs") Assisted-by: LLM Cc: stable@vger.kernel.org Signed-off-by: Akari Tsuyukusa --- Newly introduced in v2. --- drivers/clk/mediatek/clk-mtk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c index 3dfdd3a422f8..0b10a4b14a6e 100644 --- a/drivers/clk/mediatek/clk-mtk.c +++ b/drivers/clk/mediatek/clk-mtk.c @@ -363,7 +363,7 @@ int mtk_clk_register_composites(struct device *dev, while (--i >= 0) { const struct mtk_composite *mc = &mcs[i]; - if (IS_ERR_OR_NULL(clk_data->hws[mcs->id])) + if (IS_ERR_OR_NULL(clk_data->hws[mc->id])) continue; mtk_clk_unregister_composite(clk_data->hws[mc->id]); -- 2.56.0