From patchwork Mon Sep 13 13:16:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 509771 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp629282jao; Mon, 13 Sep 2021 07:47:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxqCnce4f3dfTAnqOddZ+mcigWT5UVdO4S6cAoKApSmeWCUjU9zVvkjd+IKlafN4hitpcra X-Received: by 2002:a02:5b0a:: with SMTP id g10mr6511594jab.112.1631544473781; Mon, 13 Sep 2021 07:47:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631544473; cv=none; d=google.com; s=arc-20160816; b=Gbdnk0uTXCPeFD1R9XLLFb5mApots6s+Xk/sXtd3mXupuaUezB3hKjyFDh9CzyV/Xk 95Hu74PSkNxZGlzBEZPsj17yqrTBFayMdtkLHEf4hVr+XbQUNmUFMsaG65a0TkAN+Rkf V24RvneuTvbGXSq6yqBP3yEgIMJ084WGImhZg9YAiayyXnEIUzj+v9/eO6/byhGOcn+n Rc92z0e4fNNwHJLrZozzdgPK7uebV9MG3Pe1JdpzbMoUpfh71mbQz7QrbbcYErI0dmZM lHXVY/s/MXoQLVuodB4O9YyZIzn7gnwdd9KaTpRemUArelLrWY/UoSBifnPGakKK8Hwy o/CQ== 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=Q4axwxCVtJdFLOFVEcyx2zTbI6+iuCise205khc9EUA=; b=ss553HYZD9JdsNixUp/hgxoyQAioh+rf8/rSq4TUTKkcDP1DhFPWDQJW6UmcHDZ7fx ldkae8350X0mGNQGaERU+/gYlZg9MGaGk/egMmThHxiTjzgfSWMAF0pw1H1Iw7ztN8pu NkHhbUgHMgH2kXg//vbmfYhjkuf0KI/MGznEnAz2+HPXfVodkb2LYVDZTm/zyJMpJksH sESgKOb8X6816X3QCdP/6avR2+nixX7cE3Cf58+DPxsD4klepYCWNXiDDd/8w3X+EF3n B1bME7OkzlhznTEGoHDbceFAz44UTiCbgGeATq95LqSuOPrJj9ISSAsDjtqKeCt3rszz YIBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=KPAkIx8r; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g63si6525133jab.37.2021.09.13.07.47.53; Mon, 13 Sep 2021 07:47:53 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=KPAkIx8r; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 S1346645AbhIMOtH (ORCPT + 11 others); Mon, 13 Sep 2021 10:49:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:33518 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345151AbhIMOrF (ORCPT ); Mon, 13 Sep 2021 10:47:05 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 51C4C6322A; Mon, 13 Sep 2021 13:58:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631541532; bh=jGWAl/K8bG2tdjP2RrtegwZ+kT089noGrVOSSSF+j2k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KPAkIx8ryFJrWfvryNWKrMPKvvmwZyyk1aYBgSvxfEm5jJYL8/9FSrGyyFxO7u7pD rsnM6LOHmcbz8roRWPYf6rDNtcJtw23F0SYuUbJvs4BSBdPuFu0jo6F9JAiu9yE+uY uTO0fg6wKXYEpJMc4d//kTUpaOwLoAKbT7v9ChqU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andrew Lunn , Chris Packham , Gregory CLEMENT , Sebastian Hesselbarth , Linus Walleij , Stephen Boyd Subject: [PATCH 5.14 334/334] clk: kirkwood: Fix a clocking boot regression Date: Mon, 13 Sep 2021 15:16:28 +0200 Message-Id: <20210913131124.721662788@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210913131113.390368911@linuxfoundation.org> References: <20210913131113.390368911@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Linus Walleij commit aaedb9e00e5400220a8871180d23a83e67f29f63 upstream. 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 Link: https://lore.kernel.org/r/20210814235514.403426-1-linus.walleij@linaro.org Reviewed-by: Andrew Lunn Signed-off-by: Stephen Boyd Signed-off-by: Greg Kroah-Hartman --- drivers/clk/mvebu/kirkwood.c | 1 + 1 file changed, 1 insertion(+) --- 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(