]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ALSA: pcm: disallow linking stream to itself
authorMichał Mirosław <mirq-linux@rere.qmqm.pl>
Mon, 8 Jun 2020 16:50:39 +0000 (18:50 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Jun 2020 14:41:57 +0000 (16:41 +0200)
commit 951e2736f4b11b58dc44d41964fa17c3527d882a upstream.

Prevent SNDRV_PCM_IOCTL_LINK linking stream to itself - the code
can't handle it. Fixed commit is not where bug was introduced, but
changes the context significantly.

Cc: stable@vger.kernel.org
Fixes: 0888c321de70 ("pcm_native: switch to fdget()/fdput()")
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Link: https://lore.kernel.org/r/89c4a2487609a0ed6af3ecf01cc972bdc59a7a2d.1591634956.git.mirq-linux@rere.qmqm.pl
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/core/pcm_native.c

index d5443eeb8b6338a2a51d7a1c158e4d87c0184e16..59e1338f8170c457834332984e086e85067fb060 100644 (file)
@@ -2163,6 +2163,12 @@ static int snd_pcm_link(struct snd_pcm_substream *substream, int fd)
        }
        pcm_file = f.file->private_data;
        substream1 = pcm_file->substream;
+
+       if (substream == substream1) {
+               res = -EINVAL;
+               goto _badf;
+       }
+
        group = kzalloc(sizeof(*group), GFP_KERNEL);
        if (!group) {
                res = -ENOMEM;