Commit 52d256cc authored by Maciej S. Szmigiero's avatar Maciej S. Szmigiero Committed by Takashi Iwai
Browse files

ALSA: ac97: Use snd_ctl_rename() to rename a control 



With the recent addition of hashed controls lookup it's not enough to just
update the control name field, the hash entries for the modified control
have to be updated too.

snd_ctl_rename() takes care of that, so use it instead of directly
modifying the control name.

While we are at it, check also that the new control name doesn't
accidentally overwrite the available buffer space.

Fixes: c27e1efb ("ALSA: control: Use xarray for faster lookups")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarMaciej S. Szmigiero <maciej.szmigiero@oracle.com>
Link: https://lore.kernel.org/r/adb68bfa0885ba4a2583794b828f8e20d23f67c7.1666296963.git.maciej.szmigiero@oracle.com


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

sound/pci/ac97/ac97_codec.c

+24 −8
Original line number Diff line number Diff line
@@ -2656,10 +2656,17 @@ EXPORT_SYMBOL(snd_ac97_resume); 
 */

static void set_ctl_name(char *dst, const char *src, const char *suffix)

{

	if (suffix)

		sprintf(dst, "%s %s", src, suffix);

	else

		strcpy(dst, src);

	const size_t msize = SNDRV_CTL_ELEM_ID_NAME_MAXLEN;



	if (suffix) {

		if (snprintf(dst, msize, "%s %s", src, suffix) >= msize)

			pr_warn("ALSA: AC97 control name '%s %s' truncated to '%s'\n",

				src, suffix, dst);

	} else {

		if (strscpy(dst, src, msize) < 0)

			pr_warn("ALSA: AC97 control name '%s' truncated to '%s'\n",

				src, dst);

	}

}



/* remove the control with the given name and optional suffix */
@@ -2687,8 +2694,11 @@ static int snd_ac97_rename_ctl(struct snd_ac97 *ac97, const char *src, 
			       const char *dst, const char *suffix)

{

	struct snd_kcontrol *kctl = ctl_find(ac97, src, suffix);

	char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];



	if (kctl) {

		set_ctl_name(kctl->id.name, dst, suffix);

		set_ctl_name(name, dst, suffix);

		snd_ctl_rename(ac97->bus->card, kctl, name);

		return 0;

	}

	return -ENOENT;
@@ -2707,11 +2717,17 @@ static int snd_ac97_swap_ctl(struct snd_ac97 *ac97, const char *s1, 
			     const char *s2, const char *suffix)

{

	struct snd_kcontrol *kctl1, *kctl2;

	char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];



	kctl1 = ctl_find(ac97, s1, suffix);

	kctl2 = ctl_find(ac97, s2, suffix);

	if (kctl1 && kctl2) {

		set_ctl_name(kctl1->id.name, s2, suffix);

		set_ctl_name(kctl2->id.name, s1, suffix);

		set_ctl_name(name, s2, suffix);

		snd_ctl_rename(ac97->bus->card, kctl1, name);



		set_ctl_name(name, s1, suffix);

		snd_ctl_rename(ac97->bus->card, kctl2, name);



		return 0;

	}

	return -ENOENT;