]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ALSA: seq: oss: Serialize ioctls
authorTakashi Iwai <tiwai@suse.de>
Tue, 4 Aug 2020 18:58:15 +0000 (20:58 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 5 Aug 2020 06:27:39 +0000 (08:27 +0200)
Some ioctls via OSS sequencer API may race and lead to UAF when the
port create and delete are performed concurrently, as spotted by a
couple of syzkaller cases.  This patch is an attempt to address it by
serializing the ioctls with the existing register_mutex.

Basically OSS sequencer API is an obsoleted interface and was designed
without much consideration of the concurrency.  There are very few
applications with it, and the concurrent performance isn't asked,
hence this "big hammer" approach should be good enough.

Reported-by: syzbot+1a54a94bd32716796edd@syzkaller.appspotmail.com
Reported-by: syzbot+9d2abfef257f3e2d4713@syzkaller.appspotmail.com
Suggested-by: Hillf Danton <hdanton@sina.com>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20200804185815.2453-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/core/seq/oss/seq_oss.c

index 17f913657304399fa3775fe377d93082833cb4fb..c8b9c0b315d8f5a931677df2d59671953caf4448 100644 (file)
@@ -168,10 +168,16 @@ static long
 odev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
        struct seq_oss_devinfo *dp;
+       long rc;
+
        dp = file->private_data;
        if (snd_BUG_ON(!dp))
                return -ENXIO;
-       return snd_seq_oss_ioctl(dp, cmd, arg);
+
+       mutex_lock(&register_mutex);
+       rc = snd_seq_oss_ioctl(dp, cmd, arg);
+       mutex_unlock(&register_mutex);
+       return rc;
 }
 
 #ifdef CONFIG_COMPAT