ASoC: SOF: topology: Use kmemdup() to replace kzalloc + memcpy

[PATCH] ASoC: SOF: topology: Use kmemdup() to replace kzalloc + memcpy

Posted by Yihao Han 4 years, 3 months ago

fix memdup.cocci warning:
sound/soc/sof/topology.c:876:19-26: WARNING opportunity for kmemdup

Generated by: scripts/coccinelle/api/memdup.cocci

Signed-off-by: Yihao Han <hanyihao@vivo.com>
---
 sound/soc/sof/topology.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c
index 367fbe2d5b31..369693cc6d10 100644
--- a/sound/soc/sof/topology.c
+++ b/sound/soc/sof/topology.c
@@ -873,11 +873,10 @@ static int sof_control_load_bytes(struct snd_soc_component *scomp,
 
 	/* copy the private data */
 	if (priv_size > 0) {
-		scontrol->priv = kzalloc(priv_size, GFP_KERNEL);
+		scontrol->priv = kmemdup(control->priv.data, priv_size, GFP_KERNEL);
 		if (!scontrol->priv)
 			return -ENOMEM;
 
-		memcpy(scontrol->priv, control->priv.data, priv_size);
 		scontrol->priv_size = priv_size;
 	}
 
-- 
2.17.1

Re: [PATCH] ASoC: SOF: topology: Use kmemdup() to replace kzalloc + memcpy

Posted by Pierre-Louis Bossart 4 years, 3 months ago


On 3/17/22 04:38, Yihao Han wrote:
> fix memdup.cocci warning:
> sound/soc/sof/topology.c:876:19-26: WARNING opportunity for kmemdup
> 
> Generated by: scripts/coccinelle/api/memdup.cocci
> 
> Signed-off-by: Yihao Han <hanyihao@vivo.com>

Thanks for the patch

Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

> ---
>   sound/soc/sof/topology.c | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c
> index 367fbe2d5b31..369693cc6d10 100644
> --- a/sound/soc/sof/topology.c
> +++ b/sound/soc/sof/topology.c
> @@ -873,11 +873,10 @@ static int sof_control_load_bytes(struct snd_soc_component *scomp,
>   
>   	/* copy the private data */
>   	if (priv_size > 0) {
> -		scontrol->priv = kzalloc(priv_size, GFP_KERNEL);
> +		scontrol->priv = kmemdup(control->priv.data, priv_size, GFP_KERNEL);
>   		if (!scontrol->priv)
>   			return -ENOMEM;
>   
> -		memcpy(scontrol->priv, control->priv.data, priv_size);
>   		scontrol->priv_size = priv_size;
>   	}
>

Re: [PATCH] ASoC: SOF: topology: Use kmemdup() to replace kzalloc + memcpy

Posted by Mark Brown 4 years, 3 months ago

On Thu, 17 Mar 2022 02:38:41 -0700, Yihao Han wrote:
> fix memdup.cocci warning:
> sound/soc/sof/topology.c:876:19-26: WARNING opportunity for kmemdup
> 
> Generated by: scripts/coccinelle/api/memdup.cocci
> 
> 

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: SOF: topology: Use kmemdup() to replace kzalloc + memcpy
      commit: b26f965f7c83464f60d5af411ef9a03079e41800

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark