drop alsa patch from 6.6, again

diff --git a/queue-6.6/alsa-timer-set-lower-bound-of-start-tick-time.patch b/queue-6.6/alsa-timer-set-lower-bound-of-start-tick-time.patch
deleted file mode 100644 (file)
index babb871..0000000
--- a/queue-6.6/alsa-timer-set-lower-bound-of-start-tick-time.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 7135223dedc8c3395286133970ddecae77b2a9d2 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 14 May 2024 20:27:36 +0200
-Subject: ALSA: timer: Set lower bound of start tick time
-
-From: Takashi Iwai <tiwai@suse.de>
-
-[ Upstream commit 4a63bd179fa8d3fcc44a0d9d71d941ddd62f0c4e ]
-
-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>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- sound/core/timer.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/sound/core/timer.c b/sound/core/timer.c
-index e6e551d4a29e0..42c4c2b029526 100644
---- a/sound/core/timer.c
-+++ b/sound/core/timer.c
-@@ -553,6 +553,14 @@ 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)
-+                      return -EINVAL;
-+      }
-+
-       if (start)
-               timeri->ticks = timeri->cticks = ticks;
-       else if (!timeri->cticks)
--- 
-2.43.0
-

diff --git a/queue-6.6/series b/queue-6.6/series
index 3bbef88ba4663da718fe03c9ea2b2950aa0a04f2..b2ec15403a5f0da07b94b6b35823e0b5c520b4b9 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -544,7 +544,6 @@ gpiolib-acpi-fix-failed-in-acpi_gpiochip_find-by-add.patch
 drm-amd-display-remove-pixle-rate-limit-for-subvp.patch
 drm-amd-display-revert-remove-pixle-rate-limit-for-s.patch
 eventfs-do-not-differentiate-the-toplevel-events-dir.patch
-alsa-timer-set-lower-bound-of-start-tick-time.patch
 iio-accel-mxc4005-allow-module-autoloading-via-of-co.patch
 iio-accel-mxc4005-reset-chip-on-probe-and-resume.patch
 misc-pvpanic-deduplicate-common-code.patch