]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ALSA: timer: Set lower bound of start tick time
authorTakashi Iwai <tiwai@suse.de>
Tue, 14 May 2024 18:27:36 +0000 (20:27 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 16 Jun 2024 11:32:30 +0000 (13:32 +0200)
commit 4a63bd179fa8d3fcc44a0d9d71d941ddd62f0c4e upstream.

Currently ALSA timer doesn't have the lower limit of the start tick
time, and it allows a very small size, e.g. 1 tick with 1ns resolution
for hrtimer.  Such a situation may lead to an unexpected RCU stall,
where  the callback repeatedly queuing the expire update, as reported
by fuzzer.

This patch introduces a sanity check of the timer start tick time, so
that the system returns an error when a too small start size is set.
As of this patch, the lower limit is hard-coded to 100us, which is
small enough but can still work somehow.

Reported-by: syzbot+43120c2af6ca2938cc38@syzkaller.appspotmail.com
Closes: https://lore.kernel.org/r/000000000000fa00a1061740ab6d@google.com
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20240514182745.4015-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
[ backport note: the error handling is changed, as the original commit
  is based on the recent cleanup with guard() in commit beb45974dd49
  -- tiwai ]
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/core/timer.c

index 764d2b19344e350cb6bee5250610827fce85134d..708c9a46eefe332d1c0a2ec8aa682457a8cc66d4 100644 (file)
@@ -553,6 +553,16 @@ static int snd_timer_start1(struct snd_timer_instance *timeri,
                goto unlock;
        }
 
+       /* check the actual time for the start tick;
+        * bail out as error if it's way too low (< 100us)
+        */
+       if (start) {
+               if ((u64)snd_timer_hw_resolution(timer) * ticks < 100000) {
+                       result = -EINVAL;
+                       goto unlock;
+               }
+       }
+
        if (start)
                timeri->ticks = timeri->cticks = ticks;
        else if (!timeri->cticks)