From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Date: Mon, 8 Jun 2020 16:50:39 +0000 (+0200)
Subject: ALSA: pcm: disallow linking stream to itself
X-Git-Tag: v5.8-rc1~47^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=951e2736f4b11b58dc44d41964fa17c3527d882a;p=users%2Fdwmw2%2Flinux.git

ALSA: pcm: disallow linking stream to itself

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

diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index c08732998a425..eeab8850ed76c 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -2176,6 +2176,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;