From nobody Thu Apr 2 23:54:12 2026 Received: from mail-dl1-f53.google.com (mail-dl1-f53.google.com [74.125.82.53]) (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 CC6E91F12E9 for ; Thu, 26 Mar 2026 02:31:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774492274; cv=none; b=Slwrt8ZCrcGF0WMIaDnOPP2r+SJ3oT8Hlsq3YLSFlTeo0hfc0v4Nb2Uk2ckWsxDrXGzWmt5shJlv4d9bgXKashoFP1RRFSgMwHhS73ZAzQGbxGbHjzce/wyhM1v4A/O6UeLTbpFjQQ1vPB/Hng/wFtgVeaY5CaiI7CgX+et5IMk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774492274; c=relaxed/simple; bh=jQfNAZzZ4dda+HzpCv0yCuQI7I25AxD4tAt/W/mftOY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=gKqnKkterbReTIRJntDepvECHSujVI+1Y/FAt/dFitnNt+0kcJMvEp1Wndrw7pREFXt61ef36u2btBLOtg3EO9SbL1pFQQkTj+soLnXJys9vraMxtq7DVZTRoDJ7YXfEgXSCmeQWVBYv6bXW+zzUH57mPl1D3oAJOtE3u8pjY5I= 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=cLlVGEJQ; arc=none smtp.client-ip=74.125.82.53 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="cLlVGEJQ" Received: by mail-dl1-f53.google.com with SMTP id a92af1059eb24-1271195d2a7so1184456c88.0 for ; Wed, 25 Mar 2026 19:31:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774492272; x=1775097072; 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=pBcJSzFuctU+GfEBiYZvWLtMmVeo006YejPME9qEv9c=; b=cLlVGEJQaDqEna6V66S6gjHvuerZfPes7FPEfzX+hWVG1SUD2/ixCFxXR2cZHxBcNG 9kxUM9pw2lDBaSIbXNWJrQZkywe3OkXNBYlzx1puDpks+xTreldg7mBP0iLYFbpzyCsF kiXhJqjzBsYVxPEfPA+qf3/VJTaTKgqCB0hR+2fzCxXL8vJIGoW/HMuygFbyJucVlnxy Y2OZG+EyMHS+knvJ8DdN0ooAvcBdJ88QaVp656VFAdvV7OZWGKSfziZ5bBu7w9e16BDE t5/ZKg//zdBf9koa0w7aoYVch5LMHh7hBRSKO9FrwQBsePkg72+dlqZQbfFbFkbyTQVC bUdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774492272; x=1775097072; 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=pBcJSzFuctU+GfEBiYZvWLtMmVeo006YejPME9qEv9c=; b=XsbSFRxc/G2UL56FBXVoTgFVhZAdZE2/lNm1PrHmvbrq2Kw1cimvLP87k+eTWHo4Wa B/vMLhtTwbl9IfrG3XEmIDjuJc2w5V6SGiCgDTJOcUPlc7yD1r+idp/Yl9cWu5cdYd5i mBMK5nUmBIJMHIe7Ir3g4XtdwMk8gexD/COSb8P4WRBf+NqSLZyeAHuQactKWpUYbqy1 MafxyirUrmU0QVxEYvMLWSF/IKujtkjKy86rL+mt1LxRLEd9w4KyjpDRJ9esugCIotPP 1Yl0BTl68tkXZ3x6/MoGjUStC3jWSR2VTb1Kp+ARGRxPrVWiWcOuyzKd8p3tsNAXnIwl FWxw== X-Forwarded-Encrypted: i=1; AJvYcCX4vp8UOgH+o14Z2Z9euRnMTs0E49Dx2essJnzSVycuomrL1smaup/DkUyrbzfTyBHcbExQkZYQXSd615s=@vger.kernel.org X-Gm-Message-State: AOJu0YzjEYw2H36OzFINth2N46MAHswjLvwO9sdvuqlgtyB21t9BGlcZ a/WMzwWGm2jAdlw1pLAxOK+XVabdfWolhYMyOtjvwk/8sOYkAeiwDYI/ X-Gm-Gg: ATEYQzwYh9LDnbYYcKgONQWItA1/Y9aPDF7lmOYV8emXy9yRU2tQK3bvY74nz7OJJ8n RYS5EAZ+mi3sXUqzvA2+iWjh9p56Gdr9HZ4kRzct2AUI1NFdNsNjQ7zJhtKB3xCjiV6VuQSlN8o R4PEYLBPTmNPAzuef/sqCV0lBLYfeP0iGcHftO3R+zJem+cH5OLIg/gX6lz+77din95l2byVsFh vgxekdGitfdgY+dW5GrCMDGLRjyZu/txwyCZaM4LYMEdKx3yuiSeIlB1nZBtc/rqxI4SOw5S1Vo byiYLZS5EYZNASa6lp3wWGMKsmkDYGI+SRarBYX/lni31Jucp4DjQcev2OUavWbZmLKViU5TVsa r1qMj0BOKwUFEmzUvTPxISMAN55b2/QbQpXF+rXXjr6mnfbIr4Q3uFylnpogdRbCVjPAI/ZPEwS xX3l4NWmVHLIW+I2ThgnrVNyh4esnpbFyDRzlWYw4kY2G5FgspIPLZK8s= X-Received: by 2002:a05:7022:ec86:b0:119:e569:f277 with SMTP id a92af1059eb24-12a96eeafbfmr3092480c88.32.1774492271674; Wed, 25 Mar 2026 19:31:11 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d::8bd]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12aa6e5beb2sm2181796c88.1.2026.03.25.19.31.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2026 19:31:11 -0700 (PDT) From: Rosen Penev To: linux-sound@vger.kernel.org Cc: Liam Girdwood , Peter Ujfalusi , Bard Liao , Ranjani Sridharan , Daniel Baluta , Kai Vehmanen , Pierre-Louis Bossart , Mark Brown , Jaroslav Kysela , Takashi Iwai , Kees Cook , "Gustavo A. R. Silva" , sound-open-firmware@alsa-project.org (moderated list:SOUND - SOUND OPEN FIRMWARE (SOF) DRIVERS), 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)?\b) Subject: [PATCH] ASoC: SOF: topology: use kzalloc_flex Date: Wed, 25 Mar 2026 19:30:53 -0700 Message-ID: <20260326023053.53493-1-rosenp@gmail.com> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Simplify allocation by using a flexible array member. Add __counted_by for extra runtime analysis. Signed-off-by: Rosen Penev --- sound/soc/sof/sof-audio.h | 2 +- sound/soc/sof/topology.c | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/sound/soc/sof/sof-audio.h b/sound/soc/sof/sof-audio.h index 80b11625915d..138e5fcc2dd0 100644 --- a/sound/soc/sof/sof-audio.h +++ b/sound/soc/sof/sof-audio.h @@ -411,11 +411,11 @@ struct snd_sof_dai_link { struct snd_sof_tuple *tuples; int num_tuples; struct snd_soc_dai_link *link; - struct snd_soc_tplg_hw_config *hw_configs; int num_hw_configs; int default_hw_cfg_id; int type; struct list_head list; + struct snd_soc_tplg_hw_config hw_configs[] __counted_by(num_hw_configs); }; =20 /* ASoC SOF DAPM widget */ diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index 63d637db7053..413003e86f6c 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -1908,18 +1908,12 @@ static int sof_link_load(struct snd_soc_component *= scomp, int index, struct snd_ return -EINVAL; } =20 - slink =3D kzalloc_obj(*slink); + slink =3D kzalloc_flex(*slink, hw_configs, le32_to_cpu(cfg->num_hw_config= s)); if (!slink) return -ENOMEM; =20 slink->num_hw_configs =3D le32_to_cpu(cfg->num_hw_configs); - slink->hw_configs =3D kmemdup_array(cfg->hw_config, - slink->num_hw_configs, sizeof(*slink->hw_configs), - GFP_KERNEL); - if (!slink->hw_configs) { - kfree(slink); - return -ENOMEM; - } + memcpy(slink->hw_configs, cfg->hw_config, le32_to_cpu(cfg->num_hw_configs= ) * sizeof(*slink->hw_configs)); =20 slink->default_hw_cfg_id =3D le32_to_cpu(cfg->default_hw_config_id); slink->link =3D link; @@ -1932,7 +1926,6 @@ static int sof_link_load(struct snd_soc_component *sc= omp, int index, struct snd_ private->array, le32_to_cpu(private->size)); if (ret < 0) { dev_err(scomp->dev, "Failed tp parse common DAI link tokens\n"); - kfree(slink->hw_configs); kfree(slink); return ret; } @@ -2003,7 +1996,6 @@ static int sof_link_load(struct snd_soc_component *sc= omp, int index, struct snd_ /* allocate memory for tuples array */ slink->tuples =3D kzalloc_objs(*slink->tuples, num_tuples); if (!slink->tuples) { - kfree(slink->hw_configs); kfree(slink); return -ENOMEM; } @@ -2061,7 +2053,6 @@ static int sof_link_load(struct snd_soc_component *sc= omp, int index, struct snd_ =20 err: kfree(slink->tuples); - kfree(slink->hw_configs); kfree(slink); =20 return ret; @@ -2078,7 +2069,6 @@ static int sof_link_unload(struct snd_soc_component *= scomp, struct snd_soc_dobj =20 kfree(slink->tuples); list_del(&slink->list); - kfree(slink->hw_configs); kfree(slink); dobj->private =3D NULL; =20 --=20 2.53.0