Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57a4451d authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: Use strlcpy() instead of strncpy() 



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

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 97f44f56

sound/arm/pxa2xx-ac97.c

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ static int pxa2xx_ac97_probe(struct platform_device *dev) 
		goto err;



	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);

	if (ret)

sound/i2c/other/ak4xxx-adda.c

+1 −1
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ static int ak4xxx_capture_source_info(struct snd_kcontrol *kcontrol, 
	if (idx >= num_names)

		return -EINVAL;

	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));

	return 0;

}

sound/pci/cs5535audio/cs5535audio_olpc.c

+2 −2
Original line number Diff line number Diff line
@@ -161,13 +161,13 @@ int olpc_quirks(struct snd_card *card, struct snd_ac97 *ac97) 
	/* drop the original AD1888 HPF control */

	memset(&elem, 0, sizeof(elem));

	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);



	/* drop the original V_REFOUT control */

	memset(&elem, 0, sizeof(elem));

	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);



	/* add the OLPC-specific controls */

sound/pci/ice1712/psc724.c

+2 −2
Original line number Diff line number Diff line
@@ -203,12 +203,12 @@ static void psc724_set_jack_state(struct snd_ice1712 *ice, bool hp_connected) 
	/* notify about master speaker mute change */

	memset(&elem_id, 0, sizeof(elem_id));

	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));

	kctl = snd_ctl_find_id(ice->card, &elem_id);

	snd_ctl_notify(ice->card, SNDRV_CTL_EVENT_MASK_VALUE, &kctl->id);

	/* 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));

	kctl = snd_ctl_find_id(ice->card, &elem_id);

	snd_ctl_notify(ice->card, SNDRV_CTL_EVENT_MASK_VALUE, &kctl->id);

sound/pci/ice1712/wm8776.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static void snd_wm8776_activate_ctl(struct snd_wm8776 *wm, 
	unsigned int index_offset;



	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;

	kctl = snd_ctl_find_id(card, &elem_id);

	if (!kctl)