Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3093286ybt; Mon, 29 Jun 2020 15:10:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwXXCZtxV2O5hCDldJ/qz5cNs3VQ1mhGyJ+faVi2mFpxy/bPBelPHSqXJKNJu6nKCCxdwAs X-Received: by 2002:a50:f05d:: with SMTP id u29mr20518477edl.137.1593468640096; Mon, 29 Jun 2020 15:10:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593468640; cv=none; d=google.com; s=arc-20160816; b=k02oh4B/F6O4xrC4X6mBTbvS1r7cy9ZtwXKGsv5B39la8d03FDWvUyKYYZ4TiQEJcV 3vdCMiovxKAMkfNopH+3TJysUId6gC24Th6Tt1MybkrK3TY7td0FHW2AvCM1tbXm4dlG TMs7UZ4bQNjNkobGTciiegbTyOvhTwDGaOZMit2hyFUg8E3vxcE7Xg57GSMgqseSCLyW nHo5W3nCn+tjIlNTZ3k7qdXBz6t0bQ03yFryUVZlmp0JEA2hZoowK7EFN09+DEJMUDaQ QOEOVJh5ELirrz1UlZG4Hy45kzjIhhEprxpmyMgxpb8pvAUdasPP71tt9J4mdyAfmqNW WBQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=MrThC0ggn1OpTE2l5pUgtErUuOVBWTaJGF09mRBxEh4=; b=YoBlP9HMBWebVAAvPHzM587W7/uGxRK906svhtZlF1D3g1UUJmDUC+SQuwhtLStooD J2yUihdGj7QiAB62rZ0/VrEDAPaOstaIOMqYqqpc5KLIOAMora9fi467naJ0Pt1OjKx6 mYyvCU75NjjLrbL4bPOLOTmHJt5KfQ6uN5HCfnhkn5kFRrQwmFYC3ZbZax+FUSmpUz7q Xdw/iNtb2va49XQ/aY7kEz0j4Kbz8OjmYltlYLjGRQAe1usAsdgie7f9wsJmOz2BdSx3 EO0HQJqPYol1DSFjn/3zHSslsNHMEmutqej5IqacWUgqsfMtP4Z/lIOOA1f/eSWEZviA AorA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=OzmPCf5X; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id os21si554034ejb.205.2020.06.29.15.10.16; Mon, 29 Jun 2020 15:10:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=@kernel.org header.s=default header.b=OzmPCf5X; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404850AbgF2WGi (ORCPT + 99 others); Mon, 29 Jun 2020 18:06:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:56704 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726123AbgF2SfP (ORCPT ); Mon, 29 Jun 2020 14:35:15 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9533724742; Mon, 29 Jun 2020 15:21:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593444062; bh=whz2AYzxqIosz40Rk8FfNtqCsv/X1JKsrbmEzCmFp8k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OzmPCf5XiGk65b/f2Le6y1T6qfjo3Zs0ZbkvKXjWMiverw98MexeZ0X+GJIvck6R9 EDMiSC27ZWEBkYlL5Ub4rp7q2Jpm+5gyW/N0cmuL+cvTf+aRsyE8/6FBq1RUgHlvll Hfp5buf8yVfKVJpL9OOhRqMGH5JtifQq+Ixd2lJo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Vincent Chen , Palmer Dabbelt , Sasha Levin Subject: [PATCH 5.7 170/265] clk: sifive: allocate sufficient memory for struct __prci_data Date: Mon, 29 Jun 2020 11:16:43 -0400 Message-Id: <20200629151818.2493727-171-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629151818.2493727-1-sashal@kernel.org> References: <20200629151818.2493727-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.7.7-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.7.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.7.7-rc1 X-KernelTest-Deadline: 2020-07-01T15:14+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vincent Chen [ Upstream commit d0a5fdf4cc83dabcdea668f971b8a2e916437711 ] The (struct __prci_data).hw_clks.hws is an array with dynamic elements. Using struct_size(pd, hw_clks.hws, ARRAY_SIZE(__prci_init_clocks)) instead of sizeof(*pd) to get the correct memory size of struct __prci_data for sifive/fu540-prci. After applying this modifications, the kernel runs smoothly with CONFIG_SLAB_FREELIST_RANDOM enabled on the HiFive unleashed board. Fixes: 30b8e27e3b58 ("clk: sifive: add a driver for the SiFive FU540 PRCI IP block") Signed-off-by: Vincent Chen Signed-off-by: Palmer Dabbelt Signed-off-by: Sasha Levin --- drivers/clk/sifive/fu540-prci.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/clk/sifive/fu540-prci.c b/drivers/clk/sifive/fu540-prci.c index 6282ee2f361cd..a8901f90a61ac 100644 --- a/drivers/clk/sifive/fu540-prci.c +++ b/drivers/clk/sifive/fu540-prci.c @@ -586,7 +586,10 @@ static int sifive_fu540_prci_probe(struct platform_device *pdev) struct __prci_data *pd; int r; - pd = devm_kzalloc(dev, sizeof(*pd), GFP_KERNEL); + pd = devm_kzalloc(dev, + struct_size(pd, hw_clks.hws, + ARRAY_SIZE(__prci_init_clocks)), + GFP_KERNEL); if (!pd) return -ENOMEM; -- 2.25.1