From patchwork Sat Aug 14 23:55:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 12436985 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70D39C4338F for ; Sat, 14 Aug 2021 23:57:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 402BC60F92 for ; Sat, 14 Aug 2021 23:57:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233716AbhHNX5x (ORCPT ); Sat, 14 Aug 2021 19:57:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60750 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233644AbhHNX5x (ORCPT ); Sat, 14 Aug 2021 19:57:53 -0400 Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D248EC061764 for ; Sat, 14 Aug 2021 16:57:23 -0700 (PDT) Received: by mail-lf1-x12a.google.com with SMTP id y34so27082197lfa.8 for ; Sat, 14 Aug 2021 16:57:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=AdCTBaA9Glsngsdr3pyqLLw8trkmQt1Ycmzpqp2rJpw=; b=e/lW3SLNmsYpcYIc6GcDc7pvq+Q6mq7u2fMlYfmvNMnyuJXZ2xHzVqUHrw56mZ5FDG TkUFNCiD67GNgfiGQpjVVWhq7BLlwbPkjF0/xwk7Wyq874cWU4wF1o9vleD3BLxeEwr8 b9hb0JZsZQzLyBGtuWgkcX267qIYr6X6O4DE/vkBxAXLvtGikHBngeWp+8xJ7OeHOSyt dXfBLnWqaaToDTNWFa6CPgtEsW9owDENSwByRvfi+fMNA1txKtZ6/r4nSJLH1GaY5bDa CP4+T08/TWZE3ZngvkKIKt4cw73QEC28dAcUJOjGV3ShintdAgOW039XyIFtNd8gLfct 7H6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=AdCTBaA9Glsngsdr3pyqLLw8trkmQt1Ycmzpqp2rJpw=; b=PX57kkkDCZrDWOFCX2csIQsiSq0PWhOdlt7m8e4P7uDkPb31WSBkUBmhZWyd35ctNv VsUjwoXxB8NCyWnTiTq1pP2I2hlfVJQMIbAiB+6JhBXPMerRqPl1ta1RigkGzWDt/t1E Nvi7xwJJpYZnlXn52NIiONq89+H+ShiCeEIPfssTmkjQeoLQhgrxgygrbRbnit1kCn2A R1HC9um6vIfsu8xZK30xrCLpu0sRvbweq8QRDT0mIs4U52L1sXfKT+IuEhk7PdiQIcrj wV6QXDwuYBtyIpddb0EVPvsNDSQihULy12zx7Rm4RyBZ8Ia+JBJNUEMDBsU15BzhaoX6 ltNg== X-Gm-Message-State: AOAM530Y0hvOfhj60+XgzMoLQzvPCSf79CYzLXNeYYLpp8rJzfQVmi99 9IOZk+IkVl+5xpXcPx7tXcraOw== X-Google-Smtp-Source: ABdhPJzRYfv9UC4yMQI18Os6alKkBllw2NKdWdS6zHwQqviF6jL9LueVoa7ThERx4a6dz17oo6KTZg== X-Received: by 2002:a05:6512:3c9d:: with SMTP id h29mr6561804lfv.600.1628985442064; Sat, 14 Aug 2021 16:57:22 -0700 (PDT) Received: from localhost.localdomain (c-fdcc225c.014-348-6c756e10.bbcust.telenor.se. [92.34.204.253]) by smtp.gmail.com with ESMTPSA id 13sm441727ljf.110.2021.08.14.16.57.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Aug 2021 16:57:21 -0700 (PDT) From: Linus Walleij To: Michael Turquette , Stephen Boyd Cc: linux-clk@vger.kernel.org, Linus Walleij , stable@vger.kernel.org, Andrew Lunn , Chris Packham , Gregory CLEMENT , Sebastian Hesselbarth Subject: [PATCH] clk: kirkwood: Fix a clocking boot regression Date: Sun, 15 Aug 2021 01:55:14 +0200 Message-Id: <20210814235514.403426-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org Since a few kernel releases the Pogoplug 4 has crashed like this during boot: Unable to handle kernel NULL pointer dereference at virtual address 00000002 (...) [] (strlen) from [] (kstrdup+0x1c/0x4c) [] (kstrdup) from [] (__clk_register+0x44/0x37c) [] (__clk_register) from [] (clk_hw_register+0x20/0x44) [] (clk_hw_register) from [] (__clk_hw_register_mux+0x198/0x1e4) [] (__clk_hw_register_mux) from [] (clk_register_mux_table+0x5c/0x6c) [] (clk_register_mux_table) from [] (kirkwood_clk_muxing_setup.constprop.0+0x13c/0x1ac) [] (kirkwood_clk_muxing_setup.constprop.0) from [] (of_clk_init+0x12c/0x214) [] (of_clk_init) from [] (time_init+0x20/0x2c) [] (time_init) from [] (start_kernel+0x3dc/0x56c) [] (start_kernel) from [<00000000>] (0x0) Code: e3130020 1afffffb e12fff1e c08a1078 (e5d03000) This is because the "powersave" mux clock 0 was provided in an unterminated array, which is required by the loop in the driver: /* Count, allocate, and register clock muxes */ for (n = 0; desc[n].name;) n++; Here n will go out of bounds and then call clk_register_mux() on random memory contents after the mux clock. Fix this by terminating the array with a blank entry. Fixes: 105299381d87 ("cpufreq: kirkwood: use the powersave multiplexer") Cc: stable@vger.kernel.org Cc: Andrew Lunn Cc: Chris Packham Cc: Gregory CLEMENT Cc: Sebastian Hesselbarth Signed-off-by: Linus Walleij Reviewed-by: Andrew Lunn --- drivers/clk/mvebu/kirkwood.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/clk/mvebu/kirkwood.c b/drivers/clk/mvebu/kirkwood.c index 47680237d0be..43b31af3a2ce 100644 --- a/drivers/clk/mvebu/kirkwood.c +++ b/drivers/clk/mvebu/kirkwood.c @@ -265,6 +265,7 @@ static const char *powersave_parents[] = { static const struct clk_muxing_soc_desc kirkwood_mux_desc[] __initconst = { { "powersave", powersave_parents, ARRAY_SIZE(powersave_parents), 11, 1, 0 }, + { }, }; static struct clk *clk_muxing_get_src(