redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ALSA: Use strlcpy() instead of strncpy() 

We tend to make stupid mistakes with strncpy().  Let's take a safer
one, strlcpy().

Signed-off-by: Takashi Iwai <tiwai@suse.de>
hifive-unleashed-5.1
Takashi Iwai 2013-10-29 15:26:12 +01:00
parent 97f44f56ca
commit 57a4451d26
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/arm/pxa2xx-ac97.c
View File

@ -185,7 +185,7 @@ static int pxa2xx_ac97_probe(struct platform_device *dev)
goto err; goto err;
card->dev = &dev->dev; card->dev = &dev->dev;
strncpy(card->driver, dev->dev.driver->name, sizeof(card->driver)); strlcpy(card->driver, dev->dev.driver->name, sizeof(card->driver));
ret = pxa2xx_pcm_new(card, &pxa2xx_ac97_pcm_client, &pxa2xx_ac97_pcm); ret = pxa2xx_pcm_new(card, &pxa2xx_ac97_pcm_client, &pxa2xx_ac97_pcm);
if (ret) if (ret)

2
sound/i2c/other/ak4xxx-adda.c
View File

@ -583,7 +583,7 @@ static int ak4xxx_capture_source_info(struct snd_kcontrol *kcontrol,
if (idx >= num_names) if (idx >= num_names)
return -EINVAL; return -EINVAL;
input_names = ak->adc_info[mixer_ch].input_names; input_names = ak->adc_info[mixer_ch].input_names;
strncpy(uinfo->value.enumerated.name, input_names[idx], strlcpy(uinfo->value.enumerated.name, input_names[idx],
sizeof(uinfo->value.enumerated.name)); sizeof(uinfo->value.enumerated.name));
return 0; return 0;
} }

4
sound/pci/cs5535audio/cs5535audio_olpc.c
View File

@ -161,13 +161,13 @@ int olpc_quirks(struct snd_card *card, struct snd_ac97 *ac97)
/* drop the original AD1888 HPF control */ /* drop the original AD1888 HPF control */
memset(&elem, 0, sizeof(elem)); memset(&elem, 0, sizeof(elem));
elem.iface = SNDRV_CTL_ELEM_IFACE_MIXER; elem.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
strncpy(elem.name, "High Pass Filter Enable", sizeof(elem.name)); strlcpy(elem.name, "High Pass Filter Enable", sizeof(elem.name));
snd_ctl_remove_id(card, &elem); snd_ctl_remove_id(card, &elem);
/* drop the original V_REFOUT control */ /* drop the original V_REFOUT control */
memset(&elem, 0, sizeof(elem)); memset(&elem, 0, sizeof(elem));
elem.iface = SNDRV_CTL_ELEM_IFACE_MIXER; elem.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
strncpy(elem.name, "V_REFOUT Enable", sizeof(elem.name)); strlcpy(elem.name, "V_REFOUT Enable", sizeof(elem.name));
snd_ctl_remove_id(card, &elem); snd_ctl_remove_id(card, &elem);
/* add the OLPC-specific controls */ /* add the OLPC-specific controls */

4
sound/pci/ice1712/psc724.c
View File

@ -203,12 +203,12 @@ static void psc724_set_jack_state(struct snd_ice1712 *ice, bool hp_connected)
/* notify about master speaker mute change */ /* notify about master speaker mute change */
memset(&elem_id, 0, sizeof(elem_id)); memset(&elem_id, 0, sizeof(elem_id));
elem_id.iface = SNDRV_CTL_ELEM_IFACE_MIXER; elem_id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
strncpy(elem_id.name, "Master Speakers Playback Switch", strlcpy(elem_id.name, "Master Speakers Playback Switch",
sizeof(elem_id.name)); sizeof(elem_id.name));
kctl = snd_ctl_find_id(ice->card, &elem_id); kctl = snd_ctl_find_id(ice->card, &elem_id);
snd_ctl_notify(ice->card, SNDRV_CTL_EVENT_MASK_VALUE, &kctl->id); snd_ctl_notify(ice->card, SNDRV_CTL_EVENT_MASK_VALUE, &kctl->id);
/* and headphone mute change */ /* and headphone mute change */
strncpy(elem_id.name, spec->wm8776.ctl[WM8776_CTL_HP_SW].name, strlcpy(elem_id.name, spec->wm8776.ctl[WM8776_CTL_HP_SW].name,
sizeof(elem_id.name)); sizeof(elem_id.name));
kctl = snd_ctl_find_id(ice->card, &elem_id); kctl = snd_ctl_find_id(ice->card, &elem_id);
snd_ctl_notify(ice->card, SNDRV_CTL_EVENT_MASK_VALUE, &kctl->id); snd_ctl_notify(ice->card, SNDRV_CTL_EVENT_MASK_VALUE, &kctl->id);

2
sound/pci/ice1712/wm8776.c
View File

@ -52,7 +52,7 @@ static void snd_wm8776_activate_ctl(struct snd_wm8776 *wm,
unsigned int index_offset; unsigned int index_offset;
memset(&elem_id, 0, sizeof(elem_id)); memset(&elem_id, 0, sizeof(elem_id));
strncpy(elem_id.name, ctl_name, sizeof(elem_id.name)); strlcpy(elem_id.name, ctl_name, sizeof(elem_id.name));
elem_id.iface = SNDRV_CTL_ELEM_IFACE_MIXER; elem_id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
kctl = snd_ctl_find_id(card, &elem_id); kctl = snd_ctl_find_id(card, &elem_id);
if (!kctl) if (!kctl)

2
sound/pci/rme9652/hdspm.c
View File

@ -6400,7 +6400,7 @@ static int snd_hdspm_hwdep_ioctl(struct snd_hwdep *hw, struct file *file,
memset(&hdspm_version, 0, sizeof(hdspm_version)); memset(&hdspm_version, 0, sizeof(hdspm_version));
hdspm_version.card_type = hdspm->io_type; hdspm_version.card_type = hdspm->io_type;
strncpy(hdspm_version.cardname, hdspm->card_name, strlcpy(hdspm_version.cardname, hdspm->card_name,
sizeof(hdspm_version.cardname)); sizeof(hdspm_version.cardname));
hdspm_version.serial = hdspm->serial; hdspm_version.serial = hdspm->serial;
hdspm_version.firmware_rev = hdspm->firmware_rev; hdspm_version.firmware_rev = hdspm->firmware_rev;