Skip to content

Commit 0e590f4

Browse files
nehebgeertu
authored andcommitted
clk: renesas: cpg-mssr: Use struct_size() helper
struct_size() is what is normally used when a flexible array member is present to avoid accidental mistakes. pm_size is still needed for the memcpy() call below. Added __counted_by for extra runtime analysis. Signed-off-by: Rosen Penev <rosenp@gmail.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Link: https://patch.msgid.link/20260324021103.13651-1-rosenp@gmail.com Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
1 parent d85cb4f commit 0e590f4

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/clk/renesas/renesas-cpg-mssr.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ static void __init cpg_mssr_register_mod_clk(const struct mssr_mod_clk *mod,
569569
struct cpg_mssr_clk_domain {
570570
struct generic_pm_domain genpd;
571571
unsigned int num_core_pm_clks;
572-
unsigned int core_pm_clks[];
572+
unsigned int core_pm_clks[] __counted_by(num_core_pm_clks);
573573
};
574574

575575
static struct cpg_mssr_clk_domain *cpg_mssr_clk_domain;
@@ -667,7 +667,7 @@ static int __init cpg_mssr_add_clk_domain(struct device *dev,
667667
size_t pm_size = num_core_pm_clks * sizeof(core_pm_clks[0]);
668668
int ret;
669669

670-
pd = devm_kzalloc(dev, sizeof(*pd) + pm_size, GFP_KERNEL);
670+
pd = devm_kzalloc(dev, struct_size(pd, core_pm_clks, num_core_pm_clks), GFP_KERNEL);
671671
if (!pd)
672672
return -ENOMEM;
673673

0 commit comments

Comments
 (0)