From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) (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 7763B35F5F8 for ; Mon, 8 Jun 2026 05:16:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780895781; cv=none; b=q+x3wO2m6K7S/1vnr3OLSHancpgLJu3YKxtlmJeylCAp21VVyKsoBqMyyV2IqMIPP7XvIriza485XfZdn2SZadPnde9BiiJWj6vJInB7M3X0LNiPvv3E6K8hX1Jk8Qv6eU1jCrMr1cBKy+88gwDdFPnuIWQkvtIrvveOrDADZ7s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780895781; c=relaxed/simple; bh=iHMQG214PPQmbdBQdYAyiKSs4eIX1mzLRERBaN7T4L8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=o2wb+/mHuQ/QumehdsozM13Qpc/SlJ2P6X/g3h7PJ03x7sALZYNtMN+ktPxCCWyy7gf35ceO6yT8wMBe7+x0wyeh2eLWab7lFlei0B7aOjR4sEGLnEeniuLbQHax7WBIjF6O1hHmm3Tjy/l7W52rV2AxRzTG+C9bb/4fxmRVk4c= 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=a3UlDHgL; arc=none smtp.client-ip=209.85.210.177 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="a3UlDHgL" Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-842264dde84so2353148b3a.0 for ; Sun, 07 Jun 2026 22:16:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780895780; x=1781500580; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ud+rVLLtmeaFikk63rpGcD+7hJ3NPyth5NFlQdc5XLg=; b=a3UlDHgLQhlsWlVHRAW8lPTrk6vDIcNlATmWTUO+GFYMMIIGVkqC/u2K2kacFPhnQf 9JAVFKhl53qdpsRH0l5su6pbPSkhouILuTqH1vI5bFs2Fcjold77cXdqe+9l8BR4jE0T c/COxENUfKWsNIwquvnzlYnKgC6R+fCdsAKKkC6ZeFlUjyfYNVPNyHZ0knmQuR+Xh7zV B7mfLecfze9MysfUEUb0SyD2+/NWhDEd5HEDGI4LuFN9a85+7sGvWZx51Zzdz4BpEBcc dIb+hHbZJK5ab06TK/HDRP3mA38hX+lGsc3giiVRar7rvDDy16sqNqM4DArGxW60kXbg CPQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780895780; x=1781500580; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ud+rVLLtmeaFikk63rpGcD+7hJ3NPyth5NFlQdc5XLg=; b=lVcryMvo3O0D8KOU1M1ol5N+Uq8MsgMnrbp1EtCkQ7egONnxf1djJ8G4zxi6M6/6qX 4aRpSxVMqlBkPYjFmtcVwtWbxPgmQMKv2hHsS/X3sKyrTQkQvRip79b7I0vSK1Ih/4PQ Pq+NVbM7372EIgifj19tLGrA27gMFKsNnupPXebUzaDtXag49Vykv/wyDyASXx3d0nFn EirUq7S3J7LjgHN10ZWTquB1FOwo10AeosLN/Hd2a8K1qAkIW5GQj/ZxA7d0ZQTveeAZ L/gX6lM5rN7HmT+3fpyj15NM6I3pvlytX2Bmmg1I96VKYeKURQNHO4mR5yLSTTd4iFUE hpxA== X-Forwarded-Encrypted: i=1; AFNElJ/4pDExkq9t36YmN5FYRjBut5yHzzjmtPwYj8jw6/peXEm30HG6HdpMgOlqoIK2pmNklgDzfDFO5qKMqlo=@vger.kernel.org X-Gm-Message-State: AOJu0Yyn58HbgelgnEbi1+atWjxaFbu9b/VFYmUuo2r6FGtxstbJfaJo ZZSZ5xPehiw8S1TxUHKQDPZoTNf0B2hVz4Cd+9dGYhUYDd+sj8JLtOP/ X-Gm-Gg: Acq92OFvHDXgJ8Ff7zW6ato7sv7GlELwh8dnpzRvGvf6DThymfpgGJkRN4Wfk8tNYth 4P1S3ci4tBNW7+F3+Aha7Rxy+yq2RqXl8tUstCN7t7D9VgcAY2tE3GftBNru6yzJFogkDyj+g14 9f5D7tiiXiihBz4qyS54jTx2/o2BdUtTd4O5XvbIL+pR+YfewKnKI14F8ukxZac89J/a28KmNFr jIqpCJZPV/7inWTgirjzE+ESN2bk3drnBA915YOmAtC0CY6fX5ShiO2DHzvFUFWpPzPlUAzGbA9 UW4pp7EhLmXjNI6WNVFVBRycNeLcib17n9n8heffHYSXhMMoFtSn1zlH+mN6dMX1o4On6KPNqAw N4bmKoBdd7AcHK8S5iBbZw8TXmKT4j/gTV6xP1edqfpxgUHUpkhRmoLjPjZulQT8kvJ6AaHhd0u LLaZOZ7InMSUXyV8w/PIQRUsF1sLwINQg/oaaI0NxgkY4TRhoDx7RJXcFbYL+UgzhdAxkzEnTPe 3Wrc0bAUaOVTVLzIO/vQGu8OP4waWBheaOY9jjqAMkSxA== X-Received: by 2002:a05:6a21:1405:b0:3b3:2fc3:880d with SMTP id adf61e73a8af0-3b4d3ce5059mr10314307637.25.1780895779906; Sun, 07 Jun 2026 22:16:19 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c85df0a61b3sm14459163a12.17.2026.06.07.22.16.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jun 2026 22:16:19 -0700 (PDT) From: Rosen Penev To: linux-clk@vger.kernel.org Cc: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Michael Turquette , Stephen Boyd , Brian Masney , Kees Cook , "Gustavo A. R. Silva" , linux-arm-kernel@lists.infradead.org (moderated list:ARM/Marvell Kirkwood and Armada 370, 375, 38x,...), linux-kernel@vger.kernel.org (open list), linux-hardening@vger.kernel.org (open list:KERNEL HARDENING (not covered by other areas):Keyword:\b__counted_by(_le|_be|_ptr)?\b) Subject: [PATCHv3] clk: kirkwood: use kzalloc_flex Date: Sun, 7 Jun 2026 22:16:02 -0700 Message-ID: <20260608051602.7176-1-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Simplify allocation by using a flexible array member and kzalloc_flex to combine allocations. Add __counted_by for extra runtime analysis. Move counting variable assignment to right after allocation. kzalloc_flex does this automatically with GCC >= 15. Signed-off-by: Rosen Penev Reviewed-by: Brian Masney --- v3: change description slightly. v2: remove unused goto. drivers/clk/mvebu/kirkwood.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/drivers/clk/mvebu/kirkwood.c b/drivers/clk/mvebu/kirkwood.c index ed061d82fb65..f4f62b241193 100644 --- a/drivers/clk/mvebu/kirkwood.c +++ b/drivers/clk/mvebu/kirkwood.c @@ -253,8 +253,8 @@ struct clk_muxing_soc_desc { struct clk_muxing_ctrl { spinlock_t *lock; - struct clk **muxes; int num_muxes; + struct clk *muxes[] __counted_by(num_muxes); }; static const char *powersave_parents[] = { @@ -297,21 +297,18 @@ static void __init kirkwood_clk_muxing_setup(struct device_node *np, if (WARN_ON(!base)) return; - ctrl = kzalloc_obj(*ctrl); - if (WARN_ON(!ctrl)) - goto ctrl_out; - - /* lock must already be initialized */ - ctrl->lock = &ctrl_gating_lock; - /* Count, allocate, and register clock muxes */ for (n = 0; desc[n].name;) n++; + ctrl = kzalloc_flex(*ctrl, muxes, n); + if (WARN_ON(!ctrl)) + goto ctrl_out; + ctrl->num_muxes = n; - ctrl->muxes = kzalloc_objs(struct clk *, ctrl->num_muxes); - if (WARN_ON(!ctrl->muxes)) - goto muxes_out; + + /* lock must already be initialized */ + ctrl->lock = &ctrl_gating_lock; for (n = 0; n < ctrl->num_muxes; n++) { ctrl->muxes[n] = clk_register_mux(NULL, desc[n].name, @@ -324,8 +321,6 @@ static void __init kirkwood_clk_muxing_setup(struct device_node *np, of_clk_add_provider(np, clk_muxing_get_src, ctrl); return; -muxes_out: - kfree(ctrl); ctrl_out: iounmap(base); } -- 2.54.0