ALSA: pcm: Bail out when chmap is already present
PATCH 1/1 ALSA: pcm: Bail out when chmap is already present
When snd_pcm_add_chmap_ctls() is called to the PCM stream to which a chmap has been already assigned, it returns as an error due to the conflicting snd_ctl_add() result. However, this also clears the already assigned chmap_kctl field via pcm_chmap_ctl_private_free(), and becomes inconsistent in the later operation.
This patch adds the check of the conflicting chmap kctl before actually trying to allocate / assign. The check failure is treated as a kernel warning, as the double call of snd_pcm_add_chmap_ctls() is basically a driver bug and having the stack trace would help developers to figure out the bad code path.
Signed-off-by Takashi Iwai <[email protected]>
--- sound/core/pcm_lib.c | 2 ++ 1 file changed, 2 insertions(+)
sound/core/pcm_lib.c +2 -0
@@ -2595,6 +2595,8 @@ int snd_pcm_add_chmap_ctls(struct snd_pcm *pcm, int stream, };int err; +if (WARN_ON (pcm->streams[stream].chmap_kctl)) +return -EBUSY ; info =kzalloc (sizeof (*info),GFP_KERNEL );if (!info)return -ENOMEM ;
Signature · 1 line
2.8.2