From 17667cc1fc7cf4a32faa027ace8afd372b05774d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 27 May 2024 20:42:50 +0200 Subject: [PATCH] drop alsa patch --- ...r-set-lower-bound-of-start-tick-time.patch | 47 ------------------- queue-5.10/series | 1 - ...r-set-lower-bound-of-start-tick-time.patch | 47 ------------------- queue-5.15/series | 1 - ...r-set-lower-bound-of-start-tick-time.patch | 47 ------------------- queue-6.1/series | 1 - ...r-set-lower-bound-of-start-tick-time.patch | 47 ------------------- queue-6.6/series | 1 - ...r-set-lower-bound-of-start-tick-time.patch | 47 ------------------- queue-6.8/series | 1 - 10 files changed, 240 deletions(-) delete mode 100644 queue-5.10/alsa-timer-set-lower-bound-of-start-tick-time.patch delete mode 100644 queue-5.15/alsa-timer-set-lower-bound-of-start-tick-time.patch delete mode 100644 queue-6.1/alsa-timer-set-lower-bound-of-start-tick-time.patch delete mode 100644 queue-6.6/alsa-timer-set-lower-bound-of-start-tick-time.patch delete mode 100644 queue-6.8/alsa-timer-set-lower-bound-of-start-tick-time.patch diff --git a/queue-5.10/alsa-timer-set-lower-bound-of-start-tick-time.patch b/queue-5.10/alsa-timer-set-lower-bound-of-start-tick-time.patch deleted file mode 100644 index b3dd8f108ac..00000000000 --- a/queue-5.10/alsa-timer-set-lower-bound-of-start-tick-time.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 4a63bd179fa8d3fcc44a0d9d71d941ddd62f0c4e Mon Sep 17 00:00:00 2001 -From: Takashi Iwai -Date: Tue, 14 May 2024 20:27:36 +0200 -Subject: ALSA: timer: Set lower bound of start tick time - -From: Takashi Iwai - -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: -Link: https://lore.kernel.org/r/20240514182745.4015-1-tiwai@suse.de -Signed-off-by: Takashi Iwai -Signed-off-by: Greg Kroah-Hartman ---- - sound/core/timer.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - ---- a/sound/core/timer.c -+++ b/sound/core/timer.c -@@ -553,6 +553,14 @@ static int snd_timer_start1(struct snd_t - 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) diff --git a/queue-5.10/series b/queue-5.10/series index 769fe6628f3..9b1e231f94e 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -7,7 +7,6 @@ net-smc91x-fix-m68k-kernel-compilation-for-coldfire-cpu.patch nilfs2-fix-unexpected-freezing-of-nilfs_segctor_sync.patch nilfs2-fix-potential-hang-in-nilfs_detach_log_writer.patch alsa-core-fix-null-module-pointer-assignment-at-card-init.patch -alsa-timer-set-lower-bound-of-start-tick-time.patch wifi-cfg80211-fix-the-order-of-arguments-for-trace-e.patch net-usb-qmi_wwan-add-telit-fn920c04-compositions.patch drm-amd-display-set-color_mgmt_changed-to-true-on-un.patch diff --git a/queue-5.15/alsa-timer-set-lower-bound-of-start-tick-time.patch b/queue-5.15/alsa-timer-set-lower-bound-of-start-tick-time.patch deleted file mode 100644 index b3dd8f108ac..00000000000 --- a/queue-5.15/alsa-timer-set-lower-bound-of-start-tick-time.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 4a63bd179fa8d3fcc44a0d9d71d941ddd62f0c4e Mon Sep 17 00:00:00 2001 -From: Takashi Iwai -Date: Tue, 14 May 2024 20:27:36 +0200 -Subject: ALSA: timer: Set lower bound of start tick time - -From: Takashi Iwai - -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: -Link: https://lore.kernel.org/r/20240514182745.4015-1-tiwai@suse.de -Signed-off-by: Takashi Iwai -Signed-off-by: Greg Kroah-Hartman ---- - sound/core/timer.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - ---- a/sound/core/timer.c -+++ b/sound/core/timer.c -@@ -553,6 +553,14 @@ static int snd_timer_start1(struct snd_t - 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) diff --git a/queue-5.15/series b/queue-5.15/series index a3c6414aecc..c43d531b990 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -15,7 +15,6 @@ fs-ntfs3-taking-dos-names-into-account-during-link-counting.patch fs-ntfs3-fix-case-when-index-is-reused-during-tree-transformation.patch fs-ntfs3-break-dir-enumeration-if-directory-contents-error.patch alsa-core-fix-null-module-pointer-assignment-at-card-init.patch -alsa-timer-set-lower-bound-of-start-tick-time.patch alsa-fix-deadlocks-with-kctl-removals-at-disconnection.patch wifi-cfg80211-fix-the-order-of-arguments-for-trace-e.patch dt-bindings-rockchip-grf-add-missing-type-to-pcie-ph.patch diff --git a/queue-6.1/alsa-timer-set-lower-bound-of-start-tick-time.patch b/queue-6.1/alsa-timer-set-lower-bound-of-start-tick-time.patch deleted file mode 100644 index b3dd8f108ac..00000000000 --- a/queue-6.1/alsa-timer-set-lower-bound-of-start-tick-time.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 4a63bd179fa8d3fcc44a0d9d71d941ddd62f0c4e Mon Sep 17 00:00:00 2001 -From: Takashi Iwai -Date: Tue, 14 May 2024 20:27:36 +0200 -Subject: ALSA: timer: Set lower bound of start tick time - -From: Takashi Iwai - -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: -Link: https://lore.kernel.org/r/20240514182745.4015-1-tiwai@suse.de -Signed-off-by: Takashi Iwai -Signed-off-by: Greg Kroah-Hartman ---- - sound/core/timer.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - ---- a/sound/core/timer.c -+++ b/sound/core/timer.c -@@ -553,6 +553,14 @@ static int snd_timer_start1(struct snd_t - 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) diff --git a/queue-6.1/series b/queue-6.1/series index d376afa3d93..1bad99edb4c 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -22,7 +22,6 @@ ksmbd-avoid-to-send-duplicate-oplock-break-notifications.patch ksmbd-ignore-trailing-slashes-in-share-paths.patch alsa-hda-realtek-fix-mute-micmute-leds-don-t-work-for-probook-440-460-g11.patch alsa-core-fix-null-module-pointer-assignment-at-card-init.patch -alsa-timer-set-lower-bound-of-start-tick-time.patch alsa-fix-deadlocks-with-kctl-removals-at-disconnection.patch keys-asymmetric-add-missing-dependencies-of-fips_signature_selftest.patch wifi-mac80211-don-t-use-rate-mask-for-scanning.patch 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 index b3dd8f108ac..00000000000 --- a/queue-6.6/alsa-timer-set-lower-bound-of-start-tick-time.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 4a63bd179fa8d3fcc44a0d9d71d941ddd62f0c4e Mon Sep 17 00:00:00 2001 -From: Takashi Iwai -Date: Tue, 14 May 2024 20:27:36 +0200 -Subject: ALSA: timer: Set lower bound of start tick time - -From: Takashi Iwai - -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: -Link: https://lore.kernel.org/r/20240514182745.4015-1-tiwai@suse.de -Signed-off-by: Takashi Iwai -Signed-off-by: Greg Kroah-Hartman ---- - sound/core/timer.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - ---- a/sound/core/timer.c -+++ b/sound/core/timer.c -@@ -553,6 +553,14 @@ static int snd_timer_start1(struct snd_t - 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) diff --git a/queue-6.6/series b/queue-6.6/series index 095f191d239..5e9dddb866e 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -28,7 +28,6 @@ ksmbd-avoid-to-send-duplicate-oplock-break-notifications.patch ksmbd-ignore-trailing-slashes-in-share-paths.patch alsa-hda-realtek-fix-mute-micmute-leds-don-t-work-for-probook-440-460-g11.patch alsa-core-fix-null-module-pointer-assignment-at-card-init.patch -alsa-timer-set-lower-bound-of-start-tick-time.patch alsa-fix-deadlocks-with-kctl-removals-at-disconnection.patch keys-asymmetric-add-missing-dependency-on-crypto_sig.patch keys-asymmetric-add-missing-dependencies-of-fips_signature_selftest.patch diff --git a/queue-6.8/alsa-timer-set-lower-bound-of-start-tick-time.patch b/queue-6.8/alsa-timer-set-lower-bound-of-start-tick-time.patch deleted file mode 100644 index b3dd8f108ac..00000000000 --- a/queue-6.8/alsa-timer-set-lower-bound-of-start-tick-time.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 4a63bd179fa8d3fcc44a0d9d71d941ddd62f0c4e Mon Sep 17 00:00:00 2001 -From: Takashi Iwai -Date: Tue, 14 May 2024 20:27:36 +0200 -Subject: ALSA: timer: Set lower bound of start tick time - -From: Takashi Iwai - -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: -Link: https://lore.kernel.org/r/20240514182745.4015-1-tiwai@suse.de -Signed-off-by: Takashi Iwai -Signed-off-by: Greg Kroah-Hartman ---- - sound/core/timer.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - ---- a/sound/core/timer.c -+++ b/sound/core/timer.c -@@ -553,6 +553,14 @@ static int snd_timer_start1(struct snd_t - 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) diff --git a/queue-6.8/series b/queue-6.8/series index 4836484933d..0fb3b48a11a 100644 --- a/queue-6.8/series +++ b/queue-6.8/series @@ -33,7 +33,6 @@ ksmbd-avoid-to-send-duplicate-oplock-break-notifications.patch ksmbd-ignore-trailing-slashes-in-share-paths.patch alsa-hda-realtek-fix-mute-micmute-leds-don-t-work-for-probook-440-460-g11.patch alsa-core-fix-null-module-pointer-assignment-at-card-init.patch -alsa-timer-set-lower-bound-of-start-tick-time.patch alsa-fix-deadlocks-with-kctl-removals-at-disconnection.patch keys-asymmetric-add-missing-dependency-on-crypto_sig.patch keys-asymmetric-add-missing-dependencies-of-fips_signature_selftest.patch -- 2.47.3