ASoC: codecs: Call strscpy() with correct size argument
PATCH 1/1 ASoC: codecs: Call strscpy() with correct size argument
In aw8xxxx_profile_info(), strscpy() is called with the length of the source string "null" rather than the size of the destination buffer.
This is fine as long as the destination buffer is larger than the source string, but we should still use the destination buffer size instead to call strscpy() as intended. And since 'name' points to the fixed-size buffer 'uinfo->value.enumerated.name', we can safely omit the size argument and let strscpy() infer it using sizeof() and remove 'name'.
--- sound/soc/codecs/aw87390.c | 8 +++----- sound/soc/codecs/aw88081.c | 5 ++--- sound/soc/codecs/aw88166.c | 8 +++----- sound/soc/codecs/aw88261.c | 8 +++----- sound/soc/codecs/aw88395/aw88395.c | 8 +++----- sound/soc/codecs/aw88399.c | 8 +++----- 6 files changed, 17 insertions(+), 28 deletions(-)
sound/soc/codecs/aw87390.c +3 -5
@@ -177,7 +177,7 @@ static int aw87390_profile_info(struct snd_kcontrol *kcontrol, {struct snd_soc_component *codec =snd_soc_kcontrol_component (kcontrol);struct aw87390 *aw87390 =snd_soc_component_get_drvdata (codec); -char *prof_name, *name; +char *prof_name;int count, ret; uinfo->type =SNDRV_CTL_ELEM_TYPE_ENUMERATED ;
@@ -194,17 +194,15 @@ static int aw87390_profile_info(struct snd_kcontrol *kcontrol,if (uinfo->value.enumerated.item >= count) uinfo->value.enumerated.item = count -1 ; - name = uinfo->value.enumerated.name; count = uinfo->value.enumerated.item; ret =aw87390_dev_get_prof_name (aw87390->aw_pa, count, &prof_name);if (ret) { -strscpy (uinfo->value.enumerated.name,"null" , -strlen ("null" ) +1 ); +strscpy (uinfo->value.enumerated.name,"null" );return 0 ; } -strscpy (name, prof_name,sizeof (uinfo->value.enumerated.name)); +strscpy (uinfo->value.enumerated.name, prof_name);return 0 ; }
sound/soc/codecs/aw88081.c +2 -3
@@ -914,12 +914,11 @@ static int aw88081_profile_info(struct snd_kcontrol *kcontrol, ret =aw88081_dev_get_prof_name (aw88081->aw_pa, count, &prof_name);if (ret) { -strscpy (uinfo->value.enumerated.name,"null" , -sizeof (uinfo->value.enumerated.name)); +strscpy (uinfo->value.enumerated.name,"null" );return 0 ; } -strscpy (uinfo->value.enumerated.name, prof_name,sizeof (uinfo->value.enumerated.name)); +strscpy (uinfo->value.enumerated.name, prof_name);return 0 ; }
sound/soc/codecs/aw88166.c +3 -5
@@ -1478,7 +1478,7 @@ static int aw88166_profile_info(struct snd_kcontrol *kcontrol, {struct snd_soc_component *codec =snd_soc_kcontrol_component (kcontrol);struct aw88166 *aw88166 =snd_soc_component_get_drvdata (codec); -char *prof_name, *name; +char *prof_name;int count, ret; uinfo->type =SNDRV_CTL_ELEM_TYPE_ENUMERATED ;
@@ -1495,17 +1495,15 @@ static int aw88166_profile_info(struct snd_kcontrol *kcontrol,if (uinfo->value.enumerated.item >= count) uinfo->value.enumerated.item = count -1 ; - name = uinfo->value.enumerated.name; count = uinfo->value.enumerated.item; ret =aw88166_dev_get_prof_name (aw88166->aw_pa, count, &prof_name);if (ret) { -strscpy (uinfo->value.enumerated.name,"null" , -strlen ("null" ) +1 ); +strscpy (uinfo->value.enumerated.name,"null" );return 0 ; } -strscpy (name, prof_name,sizeof (uinfo->value.enumerated.name)); +strscpy (uinfo->value.enumerated.name, prof_name);return 0 ; }
sound/soc/codecs/aw88261.c +3 -5
@@ -819,7 +819,7 @@ static int aw88261_profile_info(struct snd_kcontrol *kcontrol, {struct snd_soc_component *codec =snd_soc_kcontrol_component (kcontrol);struct aw88261 *aw88261 =snd_soc_component_get_drvdata (codec); -char *prof_name, *name; +char *prof_name;int count, ret; uinfo->type =SNDRV_CTL_ELEM_TYPE_ENUMERATED ;
@@ -836,17 +836,15 @@ static int aw88261_profile_info(struct snd_kcontrol *kcontrol,if (uinfo->value.enumerated.item >= count) uinfo->value.enumerated.item = count -1 ; - name = uinfo->value.enumerated.name; count = uinfo->value.enumerated.item; ret =aw88261_dev_get_prof_name (aw88261->aw_pa, count, &prof_name);if (ret) { -strscpy (uinfo->value.enumerated.name,"null" , -strlen ("null" ) +1 ); +strscpy (uinfo->value.enumerated.name,"null" );return 0 ; } -strscpy (name, prof_name,sizeof (uinfo->value.enumerated.name)); +strscpy (uinfo->value.enumerated.name, prof_name);return 0 ; }
sound/soc/codecs/aw88395/aw88395.c +3 -5
@@ -175,7 +175,7 @@ static int aw88395_profile_info(struct snd_kcontrol *kcontrol, {struct snd_soc_component *codec =snd_soc_kcontrol_component (kcontrol);struct aw88395 *aw88395 =snd_soc_component_get_drvdata (codec); -char *prof_name, *name; +char *prof_name;int count, ret; uinfo->type =SNDRV_CTL_ELEM_TYPE_ENUMERATED ;
@@ -192,17 +192,15 @@ static int aw88395_profile_info(struct snd_kcontrol *kcontrol,if (uinfo->value.enumerated.item >= count) uinfo->value.enumerated.item = count -1 ; - name = uinfo->value.enumerated.name; count = uinfo->value.enumerated.item; ret =aw88395_dev_get_prof_name (aw88395->aw_pa, count, &prof_name);if (ret) { -strscpy (uinfo->value.enumerated.name,"null" , -strlen ("null" ) +1 ); +strscpy (uinfo->value.enumerated.name,"null" );return 0 ; } -strscpy (name, prof_name,sizeof (uinfo->value.enumerated.name)); +strscpy (uinfo->value.enumerated.name, prof_name);return 0 ; }
sound/soc/codecs/aw88399.c +3 -5
@@ -1831,7 +1831,7 @@ static int aw88399_profile_info(struct snd_kcontrol *kcontrol, {struct snd_soc_component *codec =snd_soc_kcontrol_component (kcontrol);struct aw88399 *aw88399 =snd_soc_component_get_drvdata (codec); -char *prof_name, *name; +char *prof_name;int count, ret; uinfo->type =SNDRV_CTL_ELEM_TYPE_ENUMERATED ;
@@ -1848,17 +1848,15 @@ static int aw88399_profile_info(struct snd_kcontrol *kcontrol,if (uinfo->value.enumerated.item >= count) uinfo->value.enumerated.item = count -1 ; - name = uinfo->value.enumerated.name; count = uinfo->value.enumerated.item; ret =aw88399_dev_get_prof_name (aw88399->aw_pa, count, &prof_name);if (ret) { -strscpy (uinfo->value.enumerated.name,"null" , -strlen ("null" ) +1 ); +strscpy (uinfo->value.enumerated.name,"null" );return 0 ; } -strscpy (name, prof_name,sizeof (uinfo->value.enumerated.name)); +strscpy (uinfo->value.enumerated.name, prof_name);return 0 ; }
Signature · 1 line
2.50.1
Mark Brown
maintainerQuoted 10 lines · Thorsten Blum
In
aw8xxxx_profile_info(),strscpy()is called with the length of the source string "null" rather than the size of the destination buffer.This is fine as long as the destination buffer is larger than the source string, but we should still use the destination buffer size instead to call
strscpy()as intended. And since 'name' points to the fixed-size buffer 'uinfo->value.enumerated.name', we can safely omit the size argument and letstrscpy()infer it usingsizeof()and remove 'name'.[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: codecs: Call strscpy() with correct size argument
commit: dcb82900b12f5809e66835918d4043284ce1d39c
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