]> git.itanic.dy.fi Git - linux-stable/commitdiff
ALSA: rawmidi: Avoid bit fields for state flags
authorTakashi Iwai <tiwai@suse.de>
Fri, 14 Feb 2020 11:13:16 +0000 (12:13 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 28 Feb 2020 15:36:16 +0000 (16:36 +0100)
commit dfa9a5efe8b932a84b3b319250aa3ac60c20f876 upstream.

The rawmidi state flags (opened, append, active_sensing) are stored in
bit fields that can be potentially racy when concurrently accessed
without any locks.  Although the current code should be fine, there is
also no any real benefit by keeping the bitfields for this kind of
short number of members.

This patch changes those bit fields flags to the simple bool fields.
There should be no size increase of the snd_rawmidi_substream by this
change.

Reported-by: syzbot+576cc007eb9f2c968200@syzkaller.appspotmail.com
Link: https://lore.kernel.org/r/20200214111316.26939-4-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
include/sound/rawmidi.h

index 6665cb29e1a238af24b7dcb4df543c147cbad742..c2a71fd8dfafd172fdf7dc798705c81d7615b8bd 100644 (file)
@@ -92,9 +92,9 @@ struct snd_rawmidi_substream {
        struct list_head list;          /* list of all substream for given stream */
        int stream;                     /* direction */
        int number;                     /* substream number */
-       unsigned int opened: 1,         /* open flag */
-                    append: 1,         /* append flag (merge more streams) */
-                    active_sensing: 1; /* send active sensing when close */
+       bool opened;                    /* open flag */
+       bool append;                    /* append flag (merge more streams) */
+       bool active_sensing;            /* send active sensing when close */
        int use_count;                  /* use counter (for output) */
        size_t bytes;
        struct snd_rawmidi *rmidi;